summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBernhard Reiter <ockham@raz.or.at>2014-10-04 14:08:20 +0200
committerBernhard Reiter <ockham@raz.or.at>2014-10-14 00:06:07 +0200
commit7963125c41b00b7e454c0fcb1406df0cabb42de0 (patch)
tree4d689db18744b4749a70e03c041287fff1e02b84 /lib
parent5471189fe6b8d2b4ef2608a57b7ea24518a1dcb8 (diff)
downloadnextcloud-server-7963125c41b00b7e454c0fcb1406df0cabb42de0.tar.gz
nextcloud-server-7963125c41b00b7e454c0fcb1406df0cabb42de0.zip
Remove two obsolete try...catch blocks.
Diffstat (limited to 'lib')
-rw-r--r--lib/private/tags.php18
1 files changed, 5 insertions, 13 deletions
diff --git a/lib/private/tags.php b/lib/private/tags.php
index 5a962c4891d..aceb88355c8 100644
--- a/lib/private/tags.php
+++ b/lib/private/tags.php
@@ -99,12 +99,7 @@ class Tags implements \OCP\ITags {
*
*/
protected function loadTags($defaultTags=array()) {
- try {
- $this->tags = $this->mapper->loadTags(array($this->user), $this->type);
- } catch(\Exception $e) {
- \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
- \OCP\Util::ERROR);
- }
+ $this->tags = $this->mapper->loadTags(array($this->user), $this->type);
if(count($defaultTags) > 0 && count($this->tags) === 0) {
$this->addMultiple($defaultTags, true);
@@ -580,13 +575,10 @@ class Tags implements \OCP\ITags {
$tag = $this->tags[$key];
$id = $tag->getId();
unset($this->tags[$key]);
- try {
- $this->mapper->delete($tag);
- } catch(\Exception $e) {
- \OCP\Util::writeLog('core', __METHOD__ . ', exception: '
- . $e->getMessage(), \OCP\Util::ERROR);
- return false;
- }
+ $this->mapper->delete($tag);
+ } else {
+ \OCP\Util::writeLog('core', __METHOD__ . 'Cannot delete tag ' . $name
+ . ': not found.', \OCP\Util::ERROR);
}
if(!is_null($id) && $id !== false) {
try {