From a2661447504cbbf00d9f0b32159fa7311dcbc479 Mon Sep 17 00:00:00 2001
From: josh4trunks <joshruehlig@gmail.com>
Date: Mon, 24 Mar 2014 18:46:42 -0700
Subject: [PATCH] Don't always $cookie_path, only set it when needed
---
lib/base.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/lib/base.php b/lib/base.php
index e86894ef29..819e22d96f 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -741,13 +741,12 @@ class OC {
OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']);
}
if (isset($_SERVER['PHP_AUTH_USER'])) {
- $cookie_path = OC::$WEBROOT ? : '/';
if (isset($_COOKIE['oc_ignore_php_auth_user'])) {
// Ignore HTTP Authentication for 5 more mintues.
- setcookie('oc_ignore_php_auth_user', $_SERVER['PHP_AUTH_USER'], time() + 300, $cookie_path);
+ setcookie('oc_ignore_php_auth_user', $_SERVER['PHP_AUTH_USER'], time() + 300, OC::$WEBROOT.(empty(OC::$WEBROOT) ? '/' : ''));
} elseif ($_SERVER['PHP_AUTH_USER'] === self::$session->get('loginname')) {
// Ignore HTTP Aunthentication to allow a different user to log in.
- setcookie('oc_ignore_php_auth_user', $_SERVER['PHP_AUTH_USER'], 0, $cookie_path);
+ setcookie('oc_ignore_php_auth_user', $_SERVER['PHP_AUTH_USER'], 0, OC::$WEBROOT.(empty(OC::$WEBROOT) ? '/' : ''));
}
}
OC_User::logout();
--
GitLab