clean up my urls

[wfpl.git] / session_messages.php

diff --git a/session_messages.php b/session_messages.php
index 481b87a..cefe24f 100644 (file)
--- a/session_messages.php
+++ b/session_messages.php
@@ -23,9 +23,9 @@
 
 # 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__.'/'.'string_array.php');
+require_once(__DIR__.'/'.'messages.php');
 
 function session_save_messages() {
        if(!isset($GLOBALS['wfpl_messages'])) {
@@ -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();
 }