Merge branch 'master' of https://git.gnu.io/gnu/gnu-social into social-master

[quix0rs-gnu-social.git] / lib / implugin.php

diff --git a/lib/implugin.php b/lib/implugin.php
index ff6eed3aa508b46327b9071c20a4531804c1f2cd..93e6ac9256549c26050cda70c3770f9268608aca 100644 (file)
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -380,7 +380,7 @@ abstract class ImPlugin extends Plugin
             $parent = $notice->getParent();
             $orig_profile = $parent->getProfile();
             $nicknames = sprintf('%1$s => %2$s', $profile->nickname, $orig_profile->nickname);
-        } catch (Exception $e) {
+        } catch (NoParentNoticeException $e) {
             $nicknames = $profile->nickname;
         }
 
@@ -402,9 +402,8 @@ abstract class ImPlugin extends Plugin
             $chan = new IMChannel($this);
             $cmd->execute($chan);
             return true;
-        } else {
-            return false;
         }
+        return false;
     }
 
     /**