summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-08-26 21:57:05 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-08-26 21:57:05 +0200
commit67a982bf8597cd03c9160344cc0d03130ffb6290 (patch)
tree7314bbcb49a8d47f8fef317474e04c65962f7dd2
parent1dd7a8c319e8d9d0943b5bfd69c6eec1116542ce (diff)
parent3d2ee95f1e06972188967b2bc19720001a4f1395 (diff)
downloadnextcloud-server-67a982bf8597cd03c9160344cc0d03130ffb6290.tar.gz
nextcloud-server-67a982bf8597cd03c9160344cc0d03130ffb6290.zip
Merge pull request #18582 from owncloud/be-consistent
Remove last occurence of `forcessl`
-rw-r--r--lib/private/user/session.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/user/session.php b/lib/private/user/session.php
index 75a884fb452..baceeb43956 100644
--- a/lib/private/user/session.php
+++ b/lib/private/user/session.php
@@ -297,8 +297,8 @@ class Session implements IUserSession, Emitter {
* Remove cookie for "remember username"
*/
public function unsetMagicInCookie() {
- //TODO: DI for cookies and OC_Config
- $secureCookie = \OC_Config::getValue('forcessl', false);
+ //TODO: DI for cookies and IRequest
+ $secureCookie = \OC::$server->getRequest()->getServerProtocol() === 'https';
unset($_COOKIE["oc_username"]); //TODO: DI
unset($_COOKIE["oc_token"]);