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

diff --git a/session_messages.php b/session_messages.php
index 6f0148c..269f7e0 100644
--- a/session_messages.php
+++ b/session_messages.php
@@ -23,9 +23,8 @@
 
 # see messages.php for documentation on how to use it.
 
-require_once('code/wfpl/session.php');
-require_once('code/wfpl/string_array.php');
-require_once('code/wfpl/messages.php');
+require_once(__DIR__.'/'.'session.php');
+require_once(__DIR__.'/'.'messages.php');
 
 function session_save_messages() {
 	if(!isset($GLOBALS['wfpl_messages'])) {
@@ -34,9 +33,12 @@ function session_save_messages() {
 	if(!is_array($GLOBALS['wfpl_messages'])) {
 		return;
 	}
+	if(!count($GLOBALS['wfpl_messages'])) {
+		return;
+	}
 
 	init_session();
-	session_set('wfpl_messages', array_to_string($GLOBALS['wfpl_messages']));
+	session_set('wfpl_messages', json_encode($GLOBALS['wfpl_messages']));
 }
 
 function session_restore_messages() {
@@ -44,7 +46,10 @@ function session_restore_messages() {
 		$messages = session_get('wfpl_messages');
 		if($messages !== false) {
 			session_clear('wfpl_messages');
-			return string_to_array($messages);
+			$messages = json_decode($messages, true);
+			if ($messages !== null) {
+				return $messages;
+			}
 		}
 	}
 	return array();