diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-07-23 22:06:03 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-07-23 22:06:03 +0200 |
| commit | fb40d9e1e65ea5f23bdaa534dbb1b3758d8c2cbd (patch) | |
| tree | 48bfa8512b49a3e168fa01d68260599735fb9f35 /lib/user.php | |
| parent | e3ea3ed3c563fce2b5fe1addfe199e3aaec7abdb (diff) | |
| parent | 7ad38535e51812e08042e46bd550aa9cc5781955 (diff) | |
| download | nextcloud-server-fb40d9e1e65ea5f23bdaa534dbb1b3758d8c2cbd.tar.gz nextcloud-server-fb40d9e1e65ea5f23bdaa534dbb1b3758d8c2cbd.zip | |
Merge branch 'master' into groups
Diffstat (limited to 'lib/user.php')
| -rw-r--r-- | lib/user.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/user.php b/lib/user.php index 908f2cbabfb..ee20f2e0971 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 { |