From 6658273b36ffc64a6c2ba66bf08cda9f3923252d Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Thu, 5 May 2005 07:35:58 +0000 Subject: - 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) --- modules/system/system.module | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/system/system.module') diff --git a/modules/system/system.module b/modules/system/system.module index ae057eed1..119c50e52 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -658,20 +658,20 @@ function system_theme_settings($key = '') { $group = ''; $rows = array(); - //Use $utype field , and strtolower() it to get the type field.. to avoid issues with ucfirst() and unicode. + // Use $utype field , and strtolower() it to get the type field.. to avoid issues with ucfirst() and unicode. $type = strtolower($utype); - $value = theme_get_setting($type . '_links'); + $value = $settings[$type . '_links']; if (!is_array($value)) { $value = array(); } - //Increment the link count, if the user has requested more links. + // Increment the link count, if the user has requested more links. if (variable_get($type . '_links_more', false)) { variable_del($type . '_links_more'); variable_set($type . '_link_count', variable_get($type . '_link_count', 5) + 5); } - //Get the amount of links to show, possibly expanding if there are more links defined than the count specifies. + // Get the amount of links to show, possibly expanding if there are more links defined than the count specifies. $count = variable_get($type . '_link_count', 5); $count = ($count > sizeof($value['link'])) ? $count : sizeof($value['link']); if (variable_get($type . '_link_count', 5) != $count) { -- cgit v1.2.3