diff options
author | Dries Buytaert <dries@buytaert.net> | 2007-04-13 08:38:05 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2007-04-13 08:38:05 +0000 |
commit | e6f10554dd45ca1acffc1481ce6945eeef56b234 (patch) | |
tree | 722c3f6720e25f02945bab0aab1edb933fd3fab2 /themes | |
parent | 4a7b9e98f42db758fbc1fb63f45d33d7b57aff55 (diff) | |
download | brdo-e6f10554dd45ca1acffc1481ce6945eeef56b234.tar.gz brdo-e6f10554dd45ca1acffc1481ce6945eeef56b234.tar.bz2 |
- Patch #135533 by asimmonds: updated themes to work properly with new language options.
Diffstat (limited to 'themes')
-rw-r--r-- | themes/bluemarine/page.tpl.php | 2 | ||||
-rw-r--r-- | themes/chameleon/chameleon.theme | 2 | ||||
-rw-r--r-- | themes/pushbutton/page.tpl.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/themes/bluemarine/page.tpl.php b/themes/bluemarine/page.tpl.php index 5298c1d0f..fce977e5f 100644 --- a/themes/bluemarine/page.tpl.php +++ b/themes/bluemarine/page.tpl.php @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language ?>" xml:lang="<?php print $language ?>"> +<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language->language ?>" xml:lang="<?php print $language->language ?>"> <head> <title><?php print $head_title ?></title> diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme index e507d415e..3153a9c1c 100644 --- a/themes/chameleon/chameleon.theme +++ b/themes/chameleon/chameleon.theme @@ -39,7 +39,7 @@ function chameleon_regions() { } function chameleon_page($content, $show_blocks = TRUE) { - $language = isset($GLOBALS['language']) ? $GLOBALS['language'] : NULL; + $language = isset($GLOBALS['language']) ? $GLOBALS['language']->language : NULL; if (theme_get_setting('toggle_favicon')) { drupal_set_html_head('<link rel="shortcut icon" href="'. check_url(theme_get_setting('favicon')) .'" type="image/x-icon" />'); diff --git a/themes/pushbutton/page.tpl.php b/themes/pushbutton/page.tpl.php index 2a1e34184..acf27949b 100644 --- a/themes/pushbutton/page.tpl.php +++ b/themes/pushbutton/page.tpl.php @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language ?>" xml:lang="<?php print $language ?>"> +<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language->language ?>" xml:lang="<?php print $language->language ?>"> <head> <title><?php print $head_title ?></title> <meta http-equiv="Content-Style-Type" content="text/css" /> |