From: Roland Häder Date: Wed, 27 Aug 2008 22:09:07 +0000 (+0000) Subject: Variable naming convention applied, previous fix fixed ;) X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f7a9e86e802fd2860efd375c1b71107fd761387e;p=mailer.git Variable naming convention applied, previous fix fixed ;) --- diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php index f3557895ac..538a432e45 100644 --- a/inc/modules/admin/what-theme_edit.php +++ b/inc/modules/admin/what-theme_edit.php @@ -40,7 +40,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin())) { // Add description as navigation point ADD_DESCR("admin", basename(__FILE__)); -global $CurrTheme; +global $currTheme; // Check for selected themes $SEL = 0; @@ -77,6 +77,10 @@ if ($SEL > 0) { // Set session set_session("mxchange_theme", $POST['default_theme']); + // Set it in config and current theme as well + $currTheme = $POST['default_theme']; + $_CONFIG['default_theme'] = $POST['default_theme']; + // Save theme ADMIN_SAVE_SETTINGS($POST); } @@ -96,7 +100,7 @@ if (SQL_NUMROWS($result) > 0) // Is the loaded theme name != current theme name? $LINK = $unix; - if ($unix != $CurrTheme) $LINK = "".$unix.""; + if ($unix != $currTheme) $LINK = "".$unix.""; // Prepare data for the row template $content = array( diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index 49b40d3582..bdfc0cd94a 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -155,7 +155,7 @@ LIMIT 1", __FILE__, __LINE__); UPDATE_ONLINE_LIST(get_session('PHPSESSID'), $GLOBALS['module'], $GLOBALS['action'], $GLOBALS['what']); // Load theme name - $CurrTheme = GET_CURR_THEME(); + $currTheme = GET_CURR_THEME(); // Set default 'what' value //* DEBUG */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-
\n"; diff --git a/inc/theme-manager.php b/inc/theme-manager.php index 3eeee63dde..a0145518ab 100644 --- a/inc/theme-manager.php +++ b/inc/theme-manager.php @@ -97,7 +97,7 @@ function GET_CURR_THEME() { function THEME_SELECTION_BOX($mod, $act, $wht, $result) { // Construction URL - global $CurrTheme; + global $currTheme; $FORM = URL."/modules.php?module=".$mod; if (!empty($act)) $FORM .= "&action=".$act; if (!empty($wht)) $FORM .= "&what=".$wht; @@ -131,7 +131,7 @@ function THEME_SELECTION_BOX($mod, $act, $wht, $result) foreach ($THEMES['theme_unix'] as $key=>$theme) { $OUT .= "