1. Fixed serialized string of $_config_defaults['pref_defaults']

2. Fixed the indentation in mods/_core/users/lib/pref_tab_functions.inc.php

diff --git a/docs/include/lib/constants.inc.php b/docs/include/lib/constants.inc.php
index 2d8d735..1bab007 100644 (file)
--- a/docs/include/lib/constants.inc.php
+++ b/docs/include/lib/constants.inc.php
@@ -47,7 +47,7 @@ $_config_defaults['theme_categories']          = 0; // disabled
 $_config_defaults['main_defaults']                = 'mods/_standard/forums/forum/list.php|mods/_core/glossary/index.php|mods/_standard/file_storage/index.php|mods/_standard/social/index.php|mods/_standard/sitemap/sitemap.php|mods/_standard/photos/index.php';
 $_config_defaults['home_defaults']             = 'mods/_standard/file_storage/index.php|mods/_standard/tests/my_tests.php|mods/_standard/tracker/my_stats.php|mods/_standard/directory/directory.php';
 $_config_defaults['side_defaults']             = 'social|menu_menu|related_topics|users_online|glossary|search|poll|posts';
-$_config_defaults['pref_defaults']            = 'a:35:{s:10:"PREF_THEME";s:7:"default";s:17:"PREF_MOBILE_THEME";s:6:"mobile";s:15:"PREF_FORM_FOCUS";i:1;s:14:"PREF_NUMBERING";i:0;s:13:"PREF_TIMEZONE";s:1:"0";s:18:"PREF_JUMP_REDIRECT";i:1;s:19:"PREF_CONTENT_EDITOR";i:2;s:15:"PREF_SHOW_GUIDE";i:1;s:14:"PREF_FONT_FACE";s:0:"";s:15:"PREF_FONT_TIMES";s:2:"1.0";s:14:"PREF_FG_COLOUR";s:0:"";s:14:"PREF_BG_COLOUR";s:0:"";s:14:"PREF_HL_COLOUR";s:0:"";s:28:"PREF_USE_ALTERNATIVE_TO_TEXT";i:0;s:16:"PREF_ALT_TO_TEXT";s:5:"audio";s:34:"PREF_ALT_TO_TEXT_APPEND_OR_REPLACE";s:6:"append";s:25:"PREF_ALT_TEXT_PREFER_LANG";s:2:"en";s:29:"PREF_USE_ALTERNATIVE_TO_AUDIO";i:0;s:17:"PREF_ALT_TO_AUDIO";s:4:"text";s:35:"PREF_ALT_TO_AUDIO_APPEND_OR_REPLACE";s:6:"append";s:26:"PREF_ALT_AUDIO_PREFER_LANG";s:2:"en";s:30:"PREF_USE_ALTERNATIVE_TO_VISUAL";i:0;s:18:"PREF_ALT_TO_VISUAL";s:4:"text";s:36:"PREF_ALT_TO_VISUAL_APPEND_OR_REPLACE";s:6:"append";s:27:"PREF_ALT_VISUAL_PREFER_LANG";s:2:"en";s:15:"PREF_DICTIONARY";i:1;s:14:"PREF_THESAURUS";i:1;s:16:"PREF_NOTE_TAKING";i:1;s:15:"PREF_CALCULATOR";i:1;s:11:"PREF_ABACUS";i:1;s:10:"PREF_ATLAS";i:1;s:17:"PREF_ENCYCLOPEDIA";i:1;s:18:"PREF_SHOW_CONTENTS";i:1;s:31:"PREF_SHOW_NEXT_PREVIOUS_BUTTONS";i:1;s:22:"PREF_SHOW_BREAD_CRUMBS";i:1;}';
+$_config_defaults['pref_defaults']            = 'a:35:{s:10:"PREF_THEME";s:7:"default";s:17:"PREF_MOBILE_THEME";s:6:"mobile";s:15:"PREF_FORM_FOCUS";i:1;s:14:"PREF_NUMBERING";i:0;s:13:"PREF_TIMEZONE";s:1:"0";s:18:"PREF_JUMP_REDIRECT";i:1;s:19:"PREF_CONTENT_EDITOR";i:2;s:15:"PREF_SHOW_GUIDE";i:1;s:14:"PREF_FONT_FACE";s:0:"";s:15:"PREF_FONT_TIMES";s:3:"1.0";s:14:"PREF_FG_COLOUR";s:0:"";s:14:"PREF_BG_COLOUR";s:0:"";s:14:"PREF_HL_COLOUR";s:0:"";s:28:"PREF_USE_ALTERNATIVE_TO_TEXT";i:0;s:16:"PREF_ALT_TO_TEXT";s:5:"audio";s:34:"PREF_ALT_TO_TEXT_APPEND_OR_REPLACE";s:6:"append";s:25:"PREF_ALT_TEXT_PREFER_LANG";s:2:"en";s:29:"PREF_USE_ALTERNATIVE_TO_AUDIO";i:0;s:17:"PREF_ALT_TO_AUDIO";s:4:"text";s:35:"PREF_ALT_TO_AUDIO_APPEND_OR_REPLACE";s:6:"append";s:26:"PREF_ALT_AUDIO_PREFER_LANG";s:2:"en";s:30:"PREF_USE_ALTERNATIVE_TO_VISUAL";i:0;s:18:"PREF_ALT_TO_VISUAL";s:4:"text";s:36:"PREF_ALT_TO_VISUAL_APPEND_OR_REPLACE";s:6:"append";s:27:"PREF_ALT_VISUAL_PREFER_LANG";s:2:"en";s:15:"PREF_DICTIONARY";i:1;s:14:"PREF_THESAURUS";i:1;s:16:"PREF_NOTE_TAKING";i:1;s:15:"PREF_CALCULATOR";i:1;s:11:"PREF_ABACUS";i:1;s:10:"PREF_ATLAS";i:1;s:17:"PREF_ENCYCLOPEDIA";i:1;s:18:"PREF_SHOW_CONTENTS";i:1;s:31:"PREF_SHOW_NEXT_PREVIOUS_BUTTONS";i:1;s:22:"PREF_SHOW_BREAD_CRUMBS";i:1;}';
 $_config_defaults['pref_inbox_notify']         = 0; // disabled
 $_config_defaults['pref_is_auto_login']                   = "disable"; // disabled
 $_config_defaults['check_version']                = 0; // disabled

diff --git a/docs/mods/_core/users/lib/pref_tab_functions.inc.php b/docs/mods/_core/users/lib/pref_tab_functions.inc.php
index 5ead052..1ba2061 100644 (file)
--- a/docs/mods/_core/users/lib/pref_tab_functions.inc.php
+++ b/docs/mods/_core/users/lib/pref_tab_functions.inc.php
@@ -149,28 +149,28 @@ global $addslashes;
  * @return an array of preferences
  */
 function assignDefaultPrefs() {
-global $db, $_config_defaults;      
-        $sql    = "SELECT value FROM ".TABLE_PREFIX."config WHERE name='pref_defaults'";
-        $result = mysql_query($sql, $db);
-        
-        if (mysql_num_rows($result) > 0)
-        {
-            $row_defaults = mysql_fetch_assoc($result);
-            $default = $row_defaults["value"];
-            
-            $temp_prefs = unserialize($default);
-            
-            // Many new preferences are introduced in 1.6.2 that are missing in old admin 
-            // default preference string. Solve this case by completing settings on new
-            // preferences with $_config_defaults
-            foreach (unserialize($_config_defaults['pref_defaults']) as $name => $value) {
-                if (!isset($temp_prefs[$name])) $temp_prefs[$name] = $value;
-            }
-        }
-        else {
-            $temp_prefs = unserialize($_config_defaults['pref_defaults']);
-        }
-        return $temp_prefs;
+       global $db, $_config_defaults;      
+       $sql    = "SELECT value FROM ".TABLE_PREFIX."config WHERE name='pref_defaults'";
+       $result = mysql_query($sql, $db);
+       
+       if (mysql_num_rows($result) > 0)
+       {
+               $row_defaults = mysql_fetch_assoc($result);
+               $default = $row_defaults["value"];
+               
+               $temp_prefs = unserialize($default);
+                           
+               // Many new preferences are introduced in 1.6.2 that are missing in old admin 
+               // default preference string. Solve this case by completing settings on new
+               // preferences with $_config_defaults
+               foreach (unserialize($_config_defaults['pref_defaults']) as $name => $value) {
+                       if (!isset($temp_prefs[$name])) $temp_prefs[$name] = $value;
+               }
+       }
+       else {
+               $temp_prefs = unserialize($_config_defaults['pref_defaults']);
+       }
+       return $temp_prefs;
 }
 
 /**