[Pkg-owncloud-commits] [owncloud] 19/104: check if a $_SESSION entry exists before we try to remove it

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 4c2d2f4dc945d978cb6a351ea1aabf4c7cf040d9
Author: Robin Appelman <icewind at owncloud.com>
Date:   Wed Dec 11 12:59:48 2013 +0100

    check if a $_SESSION entry exists before we try to remove it
---
 lib/private/session/internal.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/private/session/internal.php b/lib/private/session/internal.php
index 49b52b5..a7c9e2f 100644
--- a/lib/private/session/internal.php
+++ b/lib/private/session/internal.php
@@ -35,7 +35,9 @@ class Internal extends Memory {
 	 */
 	public function remove($key) {
 		// also remove it from $_SESSION to prevent re-setting the old value during the merge
-		unset($_SESSION[$key]);
+		if (isset($_SESSION[$key])) {
+			unset($_SESSION[$key]);
+		}
 		parent::remove($key);
 	}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git