summaryrefslogtreecommitdiffstats
path: root/lib/user/http.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-09-30 20:21:51 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2013-09-30 20:21:51 +0200
commitbed27b603de1b5eb736d123fd58b774c7f79a4fd (patch)
treee73b8fd5f69821561f5b0be5727e38d5700b7966 /lib/user/http.php
parent2cf26ee0b16bebe83a08e4be89681f73208ba9ae (diff)
parentb58a464b864e70076aa0bde6d70c727b2aa32397 (diff)
downloadnextcloud-server-bed27b603de1b5eb736d123fd58b774c7f79a4fd.tar.gz
nextcloud-server-bed27b603de1b5eb736d123fd58b774c7f79a4fd.zip
Merge branch 'master' into channels
Conflicts: lib/util.php
Diffstat (limited to 'lib/user/http.php')
-rw-r--r--lib/user/http.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/user/http.php b/lib/user/http.php
index 1e044ed4188..e99afe59ba7 100644
--- a/lib/user/http.php
+++ b/lib/user/http.php
@@ -79,7 +79,11 @@ class OC_User_HTTP extends OC_User_Backend {
curl_close($ch);
- return $status==200;
+ if($status === 200) {
+ return $uid;
+ }
+
+ return false;
}
/**