Fixed bugs with the native session driver

coreplex · Apr 11, 2015 · 4086326 · 4086326
1 parent 035ee1a
commit 4086326
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/Notifier/Session/Native.php b/src/Notifier/Session/Native.php
@@ -29,8 +29,15 @@ public function __construct(array $config)
     {
         $this->config = $config;
 
+        if ( ! isset($_SESSION)) {
+            session_start();
+        }
+
         if ($this->initialLoad) {
-            if (isset($_SESSION[$this->config['sessionPrefix']]['flash'])) {
+            if (
+                isset($_SESSION[$this->config['sessionPrefix']]) &&
+                isset($_SESSION[$this->config['sessionPrefix']]['flash'])
+            ) {
                 $this->flash = $_SESSION[$this->config['sessionPrefix']]['flash'];
                 unset($_SESSION[$this->config['sessionPrefix']]['flash']);
             }
@@ -114,7 +121,7 @@ public function flash($key, $value)
      */
     protected function getSessionData()
     {
-        $data = $_SESSION[$this->config['sessionPrefix']];
+        $data = isset($_SESSION[$this->config['sessionPrefix']]) ? $_SESSION[$this->config['sessionPrefix']] : [];
 
         return array_merge($data, $this->flash);
     }