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

diff --git a/session_messages.php b/session_messages.php
index 358994c..481b87a 100644
--- a/session_messages.php
+++ b/session_messages.php
@@ -2,21 +2,18 @@
 
 #  Copyright (C) 2007 Jason Woofenden
 #
-#  This file is part of wfpl.
-#
-#  wfpl is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU Lesser General Public License as published by the Free
-#  Software Foundation; either version 2.1 of the License, or (at your option)
-#  any later version.
-#
-#  wfpl is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-#  FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
-#  more details.
-#
-#  You should have received a copy of the GNU Lesser General Public License
-#  along with wfpl; if not, write to the Free Software Foundation, Inc., 51
-#  Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#  
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # require_once() this file instead of messages.php if you'd like to store
@@ -39,18 +36,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');
 }