summaryrefslogtreecommitdiffstats
path: root/lib/public
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2016-04-18 12:14:07 +0200
committerLukas Reschke <lukas@owncloud.com>2016-04-18 21:21:52 +0200
commit8222ad515706d62cceb14428c959b83a69ccbc8b (patch)
tree1fb2a2a86d2eaebca7e48366a7b3e50d3f3dbe7f /lib/public
parent51975d360a93daba3b2681136a77b8d7078719e9 (diff)
downloadnextcloud-server-8222ad515706d62cceb14428c959b83a69ccbc8b.tar.gz
nextcloud-server-8222ad515706d62cceb14428c959b83a69ccbc8b.zip
Move logout to controller
Testable code. Yay.
Diffstat (limited to 'lib/public')
-rw-r--r--lib/public/irequest.php2
-rw-r--r--lib/public/user.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/public/irequest.php b/lib/public/irequest.php
index a0040aa464d..296c70f4ecc 100644
--- a/lib/public/irequest.php
+++ b/lib/public/irequest.php
@@ -129,7 +129,7 @@ interface IRequest {
* Shortcut for getting cookie variables
*
* @param string $key the key that will be taken from the $_COOKIE array
- * @return array the value in the $_COOKIE element
+ * @return string the value in the $_COOKIE element
* @since 6.0.0
*/
public function getCookie($key);
diff --git a/lib/public/user.php b/lib/public/user.php
index 825e77aef6d..64ac92d2100 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -119,7 +119,7 @@ class User {
* @since 5.0.0
*/
public static function logout() {
- \OC_User::logout();
+ \OC::$server->getUserSession()->logout();
}
/**