* Dummy extension "yoomedia" added for Yoo! Media's API (Interface 2.0 supported)

[mailer.git] / inc / theme-manager.php

diff --git a/inc/theme-manager.php b/inc/theme-manager.php
index f463d232337774b46a661166e748d46e9e9eae86..3eeee63dde45d33663d1891998663790ce9ef93d 100644 (file)
--- a/inc/theme-manager.php
+++ b/inc/theme-manager.php
@@ -38,6 +38,9 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
        require($INC);
 }
 
+// Always make sure the session management is initialized first
+require_once(PATH."inc/session.php");
+
 //
 function GET_CURR_THEME() {
        global $INC_POOL, $_CONFIG, $CSS;
@@ -50,7 +53,7 @@ function GET_CURR_THEME() {
 
        if (!isSessionVariableSet('mxchange_theme')) {
                // Set default theme
-               set_session("mxchange_theme", $ret, (time() + 60*60*24*365), COOKIE_PATH);
+               set_session("mxchange_theme", $ret);
        } 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(get_session('mxchange_theme')), __FILE__, __LINE__);
@@ -68,17 +71,17 @@ function GET_CURR_THEME() {
                // Installation mode active
                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);
+                       set_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);
+                       set_session("mxchange_theme", $_POST['theme']);
                }
 
                // Set return value
                $ret = get_session('mxchange_theme');
        } else {
                // Invalid design, reset cookie
-               set_session("mxchange_theme", $ret, (time() + 60*60*24*365), COOKIE_PATH);
+               set_session("mxchange_theme", $ret);
        }
 
        // Add (maybe) found theme.php file to inclusion list
@@ -149,7 +152,7 @@ if ((!empty($_POST['new_theme'])) && ($_POST['new_theme'] != $CurrTheme))
        $NewTheme = $_POST['new_theme'];
 
        // Change to new theme
-       set_session("mxchange_theme", $NewTheme, (time() + 60*60*24*365), COOKIE_PATH);
+       set_session("mxchange_theme", $NewTheme);
 
        // Remove current from array and set new
        $theme = PATH."theme/".$CurrTheme."/theme.php";