From cabf031cc031534165c3b31e6c931e9d29023a0b Mon Sep 17 00:00:00 2001 From: Matthew Vale Date: Mon, 7 Dec 2015 21:19:59 +0000 Subject: [PATCH] Fixed temp_dir not getting set correctly this would have also affected backup_dir --- core/install/resources/classes/global_settings.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/install/resources/classes/global_settings.php b/core/install/resources/classes/global_settings.php index 251153e5d2..8d10cfd716 100644 --- a/core/install/resources/classes/global_settings.php +++ b/core/install/resources/classes/global_settings.php @@ -142,17 +142,21 @@ require_once "root.php"; throw new Exception("No detect_switch was passed to me but \$_SESSION['switch'] is empty!"); } foreach ($this->_switch_dirs as $dir){ + $category = 'switch'; $session_var; preg_match( '/^switch_(.*)_dir$/', $dir, $session_var); $dir = "_$dir"; if($session_var[1] == 'script'){ $session_var[1] = 'scripts'; } - $this->$dir = $_SESSION['switch'][$session_var[1]]['dir']; + if($session_var[1] == 'temp'){ $category = 'server'; } + $this->$dir = $_SESSION[$category][$session_var[1]]['dir']; } foreach ($this->_switch_vdirs as $vdir){ + $category = 'switch'; $session_var; preg_match( '/^switch_(.*)_vdir$/', $vdir, $session_var); $vdir = "_$vdir"; - $this->$vdir = $_SESSION['switch'][$session_var[1]]['dir']; + if($session_var[1] == 'backup'){ $category = 'server'; } + $this->$vdir = $_SESSION[$category][$session_var[1]]['dir']; } $this->_switch_event_host = $_SESSION['event_socket_ip_address']; $this->_switch_event_port = $_SESSION['event_socket_port'];