diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-29 22:16:48 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-29 22:16:48 +0200 |
| commit | 63ea6844e8a943fe8dfa02a0b8d1fbef288d7278 (patch) | |
| tree | 1989362fd1c8c5dd18a0e16ab93b09398e49e147 /apps/files_sharing/lib/api.php | |
| parent | 5b4f515e7bc0d2e74094b2caa94b130cf4ec1fda (diff) | |
| download | nextcloud-server-63ea6844e8a943fe8dfa02a0b8d1fbef288d7278.tar.gz nextcloud-server-63ea6844e8a943fe8dfa02a0b8d1fbef288d7278.zip | |
- adding unit test testGetShareFromUnknownId()
- fixing getShareFromId() for Oracle
- fixing error message
Diffstat (limited to 'apps/files_sharing/lib/api.php')
| -rw-r--r-- | apps/files_sharing/lib/api.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/apps/files_sharing/lib/api.php b/apps/files_sharing/lib/api.php index 1fee3960f6f..455784558b5 100644 --- a/apps/files_sharing/lib/api.php +++ b/apps/files_sharing/lib/api.php @@ -86,7 +86,7 @@ class Api { } if ($shares === null || empty($shares)) { - return new \OC_OCS_Result(null, 404, 'share doesn\'t exists'); + return new \OC_OCS_Result(null, 404, 'share doesn\'t exist'); } else { return new \OC_OCS_Result($shares); } @@ -451,17 +451,15 @@ class Api { $query = \OCP\DB::prepare($sql); $result = $query->execute($args); - $share = Null; - if (\OCP\DB::isError($result)) { \OCP\Util::writeLog('files_sharing', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR); - } else { - if ($result->numRows() > 0) { - $share = $result->fetchRow(); - } + return null; + } + if ($share = $result->fetchRow()) { + return $share; } - return $share; + return null; } |