From 971a3fd124785033e7ed7db1018512b838c5ec58 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 16 Jul 2013 22:37:32 +0200
Subject: Early errors (in base.php) don't have session available

---
 lib/user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/user.php')

diff --git a/lib/user.php b/lib/user.php
index 830f13bb8df..d93ab1a5f73 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -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 {
-- 
cgit v1.2.3