diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-27 14:25:47 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-27 14:25:47 +0200 |
| commit | 687ba053b7055900dc938da5b82b6d391b0b4318 (patch) | |
| tree | 34e893923186c3373e85fb84e621b93f49dbf562 /lib/public | |
| parent | 469b309b21b6634b275c485fb09aa5d8d69fe33c (diff) | |
| parent | 735608f51323218a098137a4992aeafff5806f5c (diff) | |
| download | nextcloud-server-687ba053b7055900dc938da5b82b6d391b0b4318.tar.gz nextcloud-server-687ba053b7055900dc938da5b82b6d391b0b4318.zip | |
Merge branch 'master' into appframework-master
Diffstat (limited to 'lib/public')
| -rw-r--r-- | lib/public/share.php | 6 | ||||
| -rw-r--r-- | lib/public/user.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/public/share.php b/lib/public/share.php index 7a8a183574b..6c5783f1179 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -760,10 +760,10 @@ class Share { /** * @brief Get the backend class for the specified item type - * @param string Item type - * @return Sharing backend object + * @param string $itemType + * @return Share_Backend */ - private static function getBackend($itemType) { + public static function getBackend($itemType) { if (isset(self::$backends[$itemType])) { return self::$backends[$itemType]; } else if (isset(self::$backendTypes[$itemType]['class'])) { diff --git a/lib/public/user.php b/lib/public/user.php index 23ff991642d..576a64d7048 100644 --- a/lib/public/user.php +++ b/lib/public/user.php @@ -102,7 +102,7 @@ class User { * @brief Check if the password is correct * @param $uid The username * @param $password The password - * @returns true/false + * @returns mixed username on success, false otherwise * * Check if the password is correct without logging in the user */ |