Fix session expired duplicate message

joomla · Mar 27, 2016 · 8dac1f2 · 8dac1f2
1 parent aa99b10
commit 8dac1f2
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/libraries/joomla/session/session.php b/libraries/joomla/session/session.php
@@ -604,8 +604,16 @@ public function start()
 		// Perform security checks
 		if (!$this->_validate())
 		{
-			// Destroy the session if it's not valid
-			$this->destroy();
+			// If the session isn't valid because it expired try to restart it
+			// else destroy it.
+			if ($this->_state === 'expired')
+			{
+				$this->restart();
+			}
+			else
+			{
+				$this->destroy();
+			}
 		}
 
 		if ($this->_dispatcher instanceof JEventDispatcher)