aboutsummaryrefslogtreecommitdiffstats
path: root/lib/user.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/user.php')
-rw-r--r--lib/user.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/user.php b/lib/user.php
index 830f13bb8df..ee20f2e0971 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -39,7 +39,7 @@
class OC_User {
public static $userSession = null;
- private static function getUserSession() {
+ public static function getUserSession() {
if (!self::$userSession) {
$manager = new \OC\User\Manager();
self::$userSession = new \OC\User\Session($manager, \OC::$session);
@@ -83,7 +83,7 @@ class OC_User {
/**
* @return \OC\User\Manager
*/
- private static function getManager() {
+ public static function getManager() {
return self::getUserSession()->getManager();
}
@@ -316,7 +316,7 @@ class OC_User {
* @return string uid or false
*/
public static function getUser() {
- $uid = OC::$session->get('user_id');
+ $uid = OC::$session ? OC::$session->get('user_id') : null;
if (!is_null($uid)) {
return $uid;
} else {