X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ftheme-manager.php;h=f463d232337774b46a661166e748d46e9e9eae86;hb=0e899620c7a065952d6787c236fb2b33ae337d6a;hp=d591bbbfcd76967a8e51d270b1afa5f332df1e4b;hpb=121dafd40be4c4b3e41f37a943b86cf2cb48a224;p=mailer.git

diff --git a/inc/theme-manager.php b/inc/theme-manager.php
index d591bbbfcd..f463d23233 100644
--- a/inc/theme-manager.php
+++ b/inc/theme-manager.php
@@ -48,15 +48,15 @@ function GET_CURR_THEME() {
 	// Load default theme if not empty from configuration
 	if (!empty($_CONFIG['default_theme'])) $ret = $_CONFIG['default_theme'];
 
-	if (empty($_SESSION['mxchange_theme'])) {
+	if (!isSessionVariableSet('mxchange_theme')) {
 		// Set default theme
 		set_session("mxchange_theme", $ret, (time() + 60*60*24*365), COOKIE_PATH);
-	} elseif ((!empty($_SESSION['mxchange_theme'])) && (GET_EXT_VERSION("sql_patches") >= "0.1.4")) {
+	} elseif ((isSessionVariableSet('mxchange_theme')) && (GET_EXT_VERSION("sql_patches") >= "0.1.4")) {
 		// Get theme from cookie
-		$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_themes WHERE theme_path='%s' LIMIT 1", array($_SESSION['mxchange_theme']), __FILE__, __LINE__);
+		$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_themes WHERE theme_path='%s' LIMIT 1", array(get_session('mxchange_theme')), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Design is valid!
-			$ret = $_SESSION['mxchange_theme'];
+			$ret = get_session('mxchange_theme');
 		}
 
 		// Free memory
@@ -69,15 +69,13 @@ function GET_CURR_THEME() {
 		if ((!empty($_GET['theme'])) && (file_exists($theme)) && (is_readable($theme))) {
 			// Set cookie from URL data
 			set_session("mxchange_theme", $_GET['theme'], (time() + 60*60*24*365), COOKIE_PATH);
-			$_SESSION['mxchange_theme'] = $_GET['theme'];
 		} elseif (file_exists(PATH."theme/".$_POST['theme']."/theme.php")) {
 			// Set cookie from posted data
 			set_session("mxchange_theme", $_POST['theme'], (time() + 60*60*24*365), COOKIE_PATH);
-			$_SESSION['mxchange_theme'] = $_POST['theme'];
 		}
 
 		// Set return value
-		$ret = $_SESSION['mxchange_theme'];
+		$ret = get_session('mxchange_theme');
 	} else {
 		// Invalid design, reset cookie
 		set_session("mxchange_theme", $ret, (time() + 60*60*24*365), COOKIE_PATH);