http://atutor.ca/atutor/mantis/view.php?id=4626

Fixed the typo theme name "fuild" from 1.6.1

diff --git a/docs/include/vitals.inc.php b/docs/include/vitals.inc.php
index 8999f24..4b983b6 100644 (file)
--- a/docs/include/vitals.inc.php
+++ b/docs/include/vitals.inc.php
@@ -253,12 +253,13 @@ if ($_config['time_zone']) {
                // get default
                $default_theme = get_default_theme();
                
-               if (!is_dir(AT_INCLUDE_PATH . '../themes/' . $default_theme['dir_name']) || $default_theme == '') {
-                       $default_theme = array('dir_name' => get_system_default_theme());
-               }
                $_SESSION['prefs']['PREF_THEME'] = $default_theme['dir_name'];
        }
        
+       if (!is_dir(AT_INCLUDE_PATH . '../themes/' . $_SESSION['prefs']['PREF_THEME']) || $_SESSION['prefs']['PREF_THEME'] == '') {
+               $_SESSION['prefs']['PREF_THEME'] = get_system_default_theme();
+       }
+       
        // use "mobile" theme for mobile devices. For now, there's only one mobile theme and it's hardcoded.
        // When more mobile themes come in, this should be changed.
        if (isset($_SESSION['prefs']['PREF_THEME']) && file_exists(AT_INCLUDE_PATH . '../themes/' . $_SESSION['prefs']['PREF_THEME']) && isset($_SESSION['valid_user']) && $_SESSION['valid_user']) {

diff --git a/docs/install/include/ustep3.php b/docs/install/include/ustep3.php
index b94f010..1f69ac2 100644 (file)
--- a/docs/install/include/ustep3.php
+++ b/docs/install/include/ustep3.php
@@ -227,6 +227,22 @@ if(isset($_POST['submit']) && ($_POST['action'] == 'process')) {
                }
        }
 
+       /* fixed the typo of "fuild" theme that was introduced in 1.6.1 : */
+       if (version_compare($_POST['step1']['new_version'], '1.6.0', '>')) {
+               $sql = "UPDATE ".$_POST['step1']['tb_prefix']."themes 
+                          SET title='Fluid', dir_name='fluid'
+                        WHERE dir_name='fuild'";
+               mysql_query($sql, $db);
+               
+               $sql = 'UPDATE '.$_POST['step1']['tb_prefix'].'config 
+                          SET value=replace(value, \':"fuild";\', \':"fluid";\') 
+                        WHERE name=\'pref_defaults\'';
+               mysql_query($sql, $db);
+
+               $sql = 'UPDATE '.$_POST['step1']['tb_prefix'].'members 
+                          SET preferences=replace(preferences, \':"fuild";\', \':"fluid";\')';
+               mysql_query($sql, $db);
+       }
 
        if (!isset($errors)) {
                unset($errors);