Merge pull request #6256 from owncloud/session-preserver-thirdparty

preserve 3rd party values in  in the Session destructor

2 files changed, 13 insertions, 2 deletions

diff --git a/lib/private/session/internal.php b/lib/private/session/internal.php
index 60aecccc8aa..a7c9e2fdefd 100644
--- a/lib/private/session/internal.php
+++ b/lib/private/session/internal.php
@@ -26,10 +26,21 @@ class Internal extends Memory {
 	}
 
 	public function __destruct() {
-		$_SESSION = $this->data;
+		$_SESSION = array_merge($_SESSION, $this->data);
 		session_write_close();
 	}
 
+	/**
+	 * @param string $key
+	 */
+	public function remove($key) {
+		// also remove it from $_SESSION to prevent re-setting the old value during the merge
+		if (isset($_SESSION[$key])) {
+			unset($_SESSION[$key]);
+		}
+		parent::remove($key);
+	}
+
 	public function clear() {
 		session_unset();
 		@session_regenerate_id(true);
diff --git a/lib/private/session/memory.php b/lib/private/session/memory.php
index c148ff4b9b9..134cee582ed 100644
--- a/lib/private/session/memory.php
+++ b/lib/private/session/memory.php
@@ -11,7 +11,7 @@ namespace OC\Session;
 /**
  * Class Internal
  *
- * store session data in an in-memory array, not persistance
+ * store session data in an in-memory array, not persistent
  *
  * @package OC\Session
  */