diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-05-05 07:35:58 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-05-05 07:35:58 +0000 |
| commit | 6658273b36ffc64a6c2ba66bf08cda9f3923252d (patch) | |
| tree | a8f0f2d17b4d33f95c3cf9b7124c3f0bf03b8ec7 /themes/chameleon | |
| parent | 381980cb03fad0e5b929c7fba531692d116aa915 (diff) | |
| download | brdo-6658273b36ffc64a6c2ba66bf08cda9f3923252d.tar.gz brdo-6658273b36ffc64a6c2ba66bf08cda9f3923252d.tar.bz2 | |
- Patch #21855 by TDobes: the recent commit of phptemplate caused a number of problems for non-phptemplate themes. A patch is attached to address these issues.
Changes include:
* parsing of the primary/secondary links has been moved out of phptemplate and into theme_get_setting.
* unnecessary and XHTML-invalidating duplicate div#help removed from themes/bluemarine/page.tpl.php (this is already generated by theme_help)
* weird generation of the "edit primary/secondary links" messages removed from bluemarine and placed in theme.inc
* unnecessary changes to themes/bluemarine/style.css rolled back (the phptemplate bluemarine had an older version of style.css than the one in core)
* chameleon updated to work with new link scheme (passes links through theme_links)
Diffstat (limited to 'themes/chameleon')
| -rw-r--r-- | themes/chameleon/chameleon.theme | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme index 9f73c1fbd..563103c74 100644 --- a/themes/chameleon/chameleon.theme +++ b/themes/chameleon/chameleon.theme @@ -43,8 +43,8 @@ function chameleon_page($content) { $output .= "</div>\n"; - $primary_links = theme_get_setting('primary_links'); - $secondary_links = theme_get_setting('secondary_links'); + $primary_links = theme('links', theme_get_setting('primary_links')); + $secondary_links = theme('links', theme_get_setting('secondary_links')); if ($primary_links || $secondary_links) { $output .= ' <div class="navlinks">'; if ($primary_links) { |