X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=session_messages.php;h=c3e16f071fc4a99f4506964ea71612f11d24fa3d;hb=4f94560f060a7305ea791def3950adb1bda092ec;hp=358994c846c87a39e453d4b17895a414b76715a5;hpb=a11c234de210c655511de6e841eaf87d4787b3f5;p=wfpl.git

diff --git a/session_messages.php b/session_messages.php
index 358994c..c3e16f0 100644
--- a/session_messages.php
+++ b/session_messages.php
@@ -39,18 +39,22 @@ function session_save_messages() {
 	}
 
 	init_session();
-	session_set('wfpl_messages', array_to_string($GLOBALS['wfpl_messages']);
+	session_set('wfpl_messages', array_to_string($GLOBALS['wfpl_messages']));
 }
 
 function session_restore_messages() {
-	if(!session()) {
+	if(!session_exists()) {
 		return false;
 	}
 	$messages = session_get('wfpl_messages');
 	if($messages !== false) {
 		$messages = string_to_array($messages);
+		if(!(isset($GLOBALS['wfpl_messages']) && is_array($GLOBALS['wfpl_messages']))) {
+			$GLOBALS['wfpl_messages'] = array();
+		}
 		# messages from the previous run happened first
 		$GLOBALS['wfpl_messages'] = array_merge($messages, $GLOBALS['wfpl_messages']);
+
 	}
 	session_clear('wfpl_messages');
 }