[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[13695] trunk

[<ny...@us...>]

Revision: 13695
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13695&view=rev
Author:   nyloth
Date:     2008-07-17 08:21:30 +0000 (Thu, 17 Jul 2008)

Log Message:
-----------
[MOD] remove 'pref_syntax' pref for TikiWiki 3.x since it's now obsolete.

Modified Paths:
--------------
    trunk/lib/setup/js_detect.php
    trunk/lib/setup/prefs.php
    trunk/templates/tiki-admin-include-general.tpl
    trunk/tiki-admin_include_general.php

Modified: trunk/lib/setup/js_detect.php
===================================================================
--- trunk/lib/setup/js_detect.php	2008-07-17 08:19:58 UTC (rev 13694)
+++ trunk/lib/setup/js_detect.php	2008-07-17 08:21:30 UTC (rev 13695)
@@ -16,9 +16,3 @@
 	// Set a session var to be able to generate non-javascript code if there is no javascript, when noscript tag is not useful enough
 	$headerlib->add_js("setSessionVar('javascript_enabled','y');");
 }
-
-if ($prefs['pref_syntax'] == '1.9') {
-	$javascript_enabled = $prefs['javascript_enabled'];
-	$smarty->assign('javascript_enabled', $prefs['javascript_enabled']);
-}
-

Modified: trunk/lib/setup/prefs.php
===================================================================
--- trunk/lib/setup/prefs.php	2008-07-17 08:19:58 UTC (rev 13694)
+++ trunk/lib/setup/prefs.php	2008-07-17 08:21:30 UTC (rev 13695)
@@ -1027,7 +1027,6 @@
 	$prefs['wiki_3d_adjust_camera'] = '';
 	$prefs['wiki_3d_autoload'] = '';
 	$prefs['feature_sefurl'] = 'n';
-	$prefs['pref_syntax'] = '2.0';
 	$prefs['feature_mootools'] = 'n';
 	$prefs['javascript_enabled'] = 'n';
 	$prefs['feature_comments_post_as_anonymous'] = 'n';
@@ -1099,9 +1098,3 @@
 $maxRecords = $prefs['maxRecords'];
 $smarty->assign_by_ref('maxRecords', $maxRecords);
 
-// DEPRECATED: Use $prefs array instead of each global vars to access prefs ; this will be removed soon
-if ($prefs['pref_syntax'] == '1.9') {
-	extract($prefs);
-	foreach ($prefs as $k=>$v) $smarty->assign($k, $v);
-}
-

Modified: trunk/templates/tiki-admin-include-general.tpl
===================================================================
--- trunk/templates/tiki-admin-include-general.tpl	2008-07-17 08:19:58 UTC (rev 13694)
+++ trunk/templates/tiki-admin-include-general.tpl	2008-07-17 08:21:30 UTC (rev 13695)
@@ -341,14 +341,6 @@
                                                 </div>
                                         </td>
                                 </tr>
-<tr>
-<td class="form"><label for="site_nav_seper">{tr}Preference syntax{/tr}:</label></td>
-<td><select name="pref_syntax">
-<option value="1.9" {if $prefs.pref_syntax eq '1.9'}selected="selected"{/if}>1.9 - $feature_foobar</option>
-<option value="2.0" {if $prefs.pref_syntax eq '2.0'}selected="selected"{/if}>2.0 - $prefs.feature_foobar, $prefs['feature_foobar']</option>
-</select></td>
-</tr>
-
       <tr>
         <td class="button" colspan='2'>
           <input type="submit" name="new_prefs" value="{tr}Change preferences{/tr}" />

Modified: trunk/tiki-admin_include_general.php
===================================================================
--- trunk/tiki-admin_include_general.php	2008-07-17 08:19:58 UTC (rev 13694)
+++ trunk/tiki-admin_include_general.php	2008-07-17 08:21:30 UTC (rev 13695)
@@ -61,7 +61,6 @@
         "site_closed_msg",
         "helpurl",
         "tiki_version_check_frequency",
-        "pref_syntax",
     );
 
     foreach ($pref_simple_values as $svitem) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.