From e76ebabb5bb5a6b5224c03baad5bdc510c288dfe Mon Sep 17 00:00:00 2001 From: cash Date: Sun, 15 May 2011 22:50:15 +0000 Subject: fixed issue introduced with the session changes in the installer git-svn-id: http://code.elgg.org/elgg/trunk@9093 36083f99-b078-4883-b0ff-0f9b5a30f544 --- install/ElggInstaller.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'install') diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php index 68c88f620..584b5cb79 100644 --- a/install/ElggInstaller.php +++ b/install/ElggInstaller.php @@ -743,8 +743,9 @@ class ElggInstaller { session_name('Elgg'); session_start(); elgg_unregister_event_handler('boot', 'system', 'session_init'); - } else if ($stepIndex == ($settingsIndex + 1)) { + } else if (!$this->isAction && $stepIndex == ($settingsIndex + 1)) { // now using Elgg session handling so need to pass forward the system messages + // this is called on the GET of the next step session_name('Elgg'); session_start(); $messages = $_SESSION['msg']; @@ -790,7 +791,7 @@ class ElggInstaller { elgg_trigger_event('init', 'system'); // @hack finish the process of pushing system messages into new session - if ($stepIndex == ($settingsIndex + 1)) { + if (!$this->isAction && $stepIndex == ($settingsIndex + 1)) { $_SESSION['msg'] = $messages; } } -- cgit v1.2.3