diff options
| author | Dries Buytaert <dries@buytaert.net> | 2006-02-02 12:44:57 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2006-02-02 12:44:57 +0000 |
| commit | 048bec139e022952d90c10b2ddb34f06dec607be (patch) | |
| tree | 1a7d6101d8b2ea36671dc23ee56a88da64d95721 /themes | |
| parent | b0051893981780d7619c180aaa6a5fca7adfb039 (diff) | |
| download | brdo-048bec139e022952d90c10b2ddb34f06dec607be.tar.gz brdo-048bec139e022952d90c10b2ddb34f06dec607be.tar.bz2 | |
- Patch #13148 by Morbus: less globals.
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/chameleon/chameleon.theme | 3 | ||||
| -rw-r--r-- | themes/engines/phptemplate/phptemplate.engine | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme index 52f278be4..44965ef06 100644 --- a/themes/chameleon/chameleon.theme +++ b/themes/chameleon/chameleon.theme @@ -22,7 +22,6 @@ function chameleon_regions() { } function chameleon_page($content) { - global $base_path; $language = $GLOBALS['locale']; if (theme_get_setting('toggle_favicon')) { @@ -43,7 +42,7 @@ function chameleon_page($content) { $output .= " <div id=\"header\">"; if ($logo = theme_get_setting('logo')) { - $output .= " <a href=\"$base_path\" title=\"". t('Home') ."\"><img src=\"$logo\" alt=\"". t('Home') ."\" /></a>"; + $output .= " <a href=\"". base_path() ."\" title=\"". t('Home') ."\"><img src=\"$logo\" alt=\"". t('Home') ."\" /></a>"; } if (theme_get_setting('toggle_name')) { $output .= " <h1 class=\"site-name title\">". l(variable_get('site_name', 'drupal'), ""). "</h1>"; diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine index 6aa99f7f2..d28423acf 100644 --- a/themes/engines/phptemplate/phptemplate.engine +++ b/themes/engines/phptemplate/phptemplate.engine @@ -140,9 +140,8 @@ function phptemplate_features() { * into a pluggable template engine. */ function phptemplate_page($content) { - global $base_path; - /* Set title and breadcrumb to declared values */ + /* Set title and breadcrumb to declared values */ if ($_GET['q'] == variable_get('site_frontpage', 'node')) { $mission = theme_get_setting('mission'); $frontpage = true; @@ -186,7 +185,7 @@ function phptemplate_page($content) { } $variables = array( - 'base_path' => $base_path, + 'base_path' => base_path(), 'breadcrumb' => theme('breadcrumb', drupal_get_breadcrumb()), 'closure' => theme('closure'), 'content' => '<!-- begin content -->' . $content . '<!-- end content -->', |