X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=session_messages.php;h=6f0148ca9b323e6d1c9c379070cc47cc7b6a5d2e;hb=ba50d9a564ca3b8637212c634b5a61a38e6feb9f;hp=481b87a02b94c892b1621b90eea00ac6cce230dd;hpb=fa74cebf2b6bec017dbcc5e19121f10adbaf3aec;p=wfpl.git

diff --git a/session_messages.php b/session_messages.php
index 481b87a..6f0148c 100644
--- a/session_messages.php
+++ b/session_messages.php
@@ -40,18 +40,12 @@ function session_save_messages() {
 }
 
 function session_restore_messages() {
-	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();
+	if(session_exists()) {
+		$messages = session_get('wfpl_messages');
+		if($messages !== false) {
+			session_clear('wfpl_messages');
+			return string_to_array($messages);
 		}
-		# messages from the previous run happened first
-		$GLOBALS['wfpl_messages'] = array_merge($messages, $GLOBALS['wfpl_messages']);
-
 	}
-	session_clear('wfpl_messages');
+	return array();
 }