From: <ch...@us...> - 2011-08-31 23:51:17
|
Revision: 36751 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36751&view=rev Author: chealer Date: 2011-08-31 23:51:11 +0000 (Wed, 31 Aug 2011) Log Message: ----------- [FIX] Smarty preference function: show global value for overriden preferences Revert r23285, r27486 and some more workarounds with a default Nelson: feel free to check the wiki home page still behaves as it should Revision Links: -------------- http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=23285&view=rev http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=27486&view=rev Modified Paths: -------------- trunk/lib/smarty_tiki/function.preference.php trunk/templates/admin/include_i18n.tpl trunk/templates/admin/include_look.tpl trunk/templates/admin/include_wiki.tpl Modified: trunk/lib/smarty_tiki/function.preference.php =================================================================== --- trunk/lib/smarty_tiki/function.preference.php 2011-08-31 22:49:53 UTC (rev 36750) +++ trunk/lib/smarty_tiki/function.preference.php 2011-08-31 23:51:11 UTC (rev 36751) @@ -6,7 +6,7 @@ // $Id$ function smarty_function_preference( $params, $smarty ) { - global $prefslib, $prefs; require_once 'lib/prefslib.php'; + global $prefslib, $prefs, $user_overrider_prefs; require_once 'lib/prefslib.php'; if( ! isset( $params['name'] ) ) { return 'Preference name not specified.'; } @@ -21,8 +21,8 @@ if( isset($params['label']) ) { $info['name'] = $params['label']; } - if (isset($params['default'])) {// use for site_language - $info['value'] = $params['default']; + if (in_array($params['name'], $user_overrider_prefs) && isset($prefs[$params['name']])) { + $info['value'] = $prefs['site_' . $params['name']]; } if (isset($params['visible']) && $params['visible'] == 'always') { Modified: trunk/templates/admin/include_i18n.tpl =================================================================== --- trunk/templates/admin/include_i18n.tpl 2011-08-31 22:49:53 UTC (rev 36750) +++ trunk/templates/admin/include_i18n.tpl 2011-08-31 23:51:11 UTC (rev 36751) @@ -20,7 +20,7 @@ {tabset name="admin_i18n"} {tab name="{tr}Internationalization{/tr}"} -{preference name=language default=$prefs.site_language} +{preference name=language} {preference name=wiki_page_regex} {preference name=default_mail_charset} Modified: trunk/templates/admin/include_look.tpl =================================================================== --- trunk/templates/admin/include_look.tpl 2011-08-31 22:49:53 UTC (rev 36750) +++ trunk/templates/admin/include_look.tpl 2011-08-31 23:51:11 UTC (rev 36751) @@ -8,7 +8,7 @@ {tabset name="admin_look"} {tab name="{tr}Theme{/tr}"} - {preference name=style default=$prefs.site_style} + {preference name=style} <div class="adminoptionbox"> {if $prefs.javascript_enabled eq 'n' or $prefs.feature_jquery eq 'n'} <input type="submit" name="changestyle" value="{tr}Go{/tr}" /> @@ -16,7 +16,7 @@ </div> <div class="adminoptionbox"> - {preference name=style_option default=$prefs.site_style_option} + {preference name=style_option} {if $prefs.change_theme eq 'y' and ($user_prefs.theme neq '' and $prefs.site_style neq $user_prefs.theme) or ($prefs.style neq '' and $prefs.site_style neq $prefs.style)} {remarksbox type="warning" title="{tr}Admin{/tr}"}{tr}The "users can change theme" feature will override the theme displayed.{/tr}{/remarksbox} {/if} @@ -171,7 +171,7 @@ {preference name="themegenerator_feature"} <div class="adminoptionboxchild" id="themegenerator_feature_childcontainer"> <div class="adminoptionbox"> - {preference name="themegenerator_theme" default=$prefs.site_themegenerator_theme} + {preference name="themegenerator_theme"} <div class="adminoptionboxchild" id="themegenerator_feature_childcontainer"> <input type="text" name="tg_edit_theme_name" value="{$tg_edit_theme_name|escape}"{if !empty($prefs.themegenerator_theme)} style="display:none;"{/if} /> Modified: trunk/templates/admin/include_wiki.tpl =================================================================== --- trunk/templates/admin/include_wiki.tpl 2011-08-31 22:49:53 UTC (rev 36750) +++ trunk/templates/admin/include_wiki.tpl 2011-08-31 23:51:11 UTC (rev 36751) @@ -32,7 +32,7 @@ {preference name=wikiplugin_wantedpages} </fieldset> - {preference name=wikiHomePage default=$prefs.site_wikiHomePage} + {preference name=wikiHomePage} <fieldset> <legend>{tr}Page display{/tr}</legend> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |