summaryrefslogtreecommitdiff
path: root/includes/theme.inc
diff options
context:
space:
mode:
Diffstat (limited to 'includes/theme.inc')
-rw-r--r--includes/theme.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/includes/theme.inc b/includes/theme.inc
index 9fd7f8b08..855f0ef21 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -1141,6 +1141,7 @@ function theme_status_messages($display = NULL) {
* A string containing an unordered list of links.
*/
function theme_links($links, $attributes = array('class' => 'links')) {
+ global $language;
$output = '';
if (count($links) > 0) {
@@ -1159,7 +1160,8 @@ function theme_links($links, $attributes = array('class' => 'links')) {
if ($i == $num_links) {
$class .= ' last';
}
- if (isset($link['href']) && ($link['href'] == $_GET['q'] || ($link['href'] == '<front>' && drupal_is_front_page()))) {
+ if (isset($link['href']) && ($link['href'] == $_GET['q'] || ($link['href'] == '<front>' && drupal_is_front_page()))
+ && (empty($link['language']) || $link['language']->language == $language->language)) {
$class .= ' active';
}
$output .= '<li' . drupal_attributes(array('class' => $class)) . '>';