summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-05-29 00:47:44 +0200
committerRobin Appelman <icewind@owncloud.com>2013-05-29 00:47:44 +0200
commit198655f109a40074643c516e24c0bd8aef6d7cd7 (patch)
treee8b9b5733c137fc2bd521aca361a0639f0d5879b /lib
parent4b688db612239be2bf554183858aaaa0a11c46a3 (diff)
downloadnextcloud-server-198655f109a40074643c516e24c0bd8aef6d7cd7.tar.gz
nextcloud-server-198655f109a40074643c516e24c0bd8aef6d7cd7.zip
fix User->setHome when the backend action fails
Diffstat (limited to 'lib')
-rw-r--r--lib/user/user.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/user/user.php b/lib/user/user.php
index 095c37939a7..fb97ff1a6d8 100644
--- a/lib/user/user.php
+++ b/lib/user/user.php
@@ -139,8 +139,8 @@ class User {
* @return string
*/
public function getHome() {
- if ($this->backend->implementsActions(\OC_USER_BACKEND_GET_HOME)) {
- return $this->backend->getHome($this->uid);
+ if ($this->backend->implementsActions(\OC_USER_BACKEND_GET_HOME) and $home = $this->backend->getHome($this->uid)) {
+ return $home;
}
return \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data") . '/' . $this->uid; //TODO switch to Config object once implemented
}