summaryrefslogtreecommitdiffstats
path: root/controller/foldercontroller.php
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-02-10 11:15:57 +0100
committerBernhard Posselt <nukeawhale@gmail.com>2013-02-10 11:16:17 +0100
commit2d293fea4328123f9d20a73f8d1bac79e746c9bd (patch)
treead39f8e42e0dbed63d5b532f527c2912ca3f3160 /controller/foldercontroller.php
parent285ec73695ad938272a7232b3648bae7a944d3d0 (diff)
added another exception for collapsing folders
Diffstat (limited to 'controller/foldercontroller.php')
-rw-r--r--controller/foldercontroller.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/controller/foldercontroller.php b/controller/foldercontroller.php
index 2e890cb5d..ba8ab4077 100644
--- a/controller/foldercontroller.php
+++ b/controller/foldercontroller.php
@@ -29,6 +29,7 @@ use \OCA\AppFramework\Controller\Controller;
use \OCA\AppFramework\Core\API;
use \OCA\AppFramework\Http\Request;
use \OCA\AppFramework\Db\DoesNotExistException;
+use \OCA\AppFramework\Db\MultipleObjectsReturnedException;
class FolderController extends Controller {
@@ -68,6 +69,8 @@ class FolderController extends Controller {
return $this->renderJSON(array());
} catch (DoesNotExistException $e) {
return $this->renderJSON(array(), $e->getMessage());
+ } catch(MultipleObjectsReturnedException $e){
+ return $this->renderJSON(array(), $e->getMessage());
}
}