Merge branch 'fixes/private_scope_on_tags' into social-master

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

diff --git a/lib/pluginqueuehandler.php b/lib/pluginqueuehandler.php
index 24d504699706c7fe310f341ff796bc4f44c52f28..dcd07d7208800bbf1fe2e907bc3ce0e5e85e4a8a 100644 (file)
--- a/lib/pluginqueuehandler.php
+++ b/lib/pluginqueuehandler.php
@@ -17,9 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Queue handler for letting plugins handle stuff.
@@ -42,9 +40,14 @@ class PluginQueueHandler extends QueueHandler
         return 'plugin';
     }
 
-    function handle_notice($notice)
+    function handle($notice)
     {
-        Event::handle('HandleQueuedNotice', array(&$notice));
+        try {
+            Event::handle('HandleQueuedNotice', array(&$notice));
+        } catch (NoProfileException $unp) {
+            // We can't do anything about this, so just skip
+            return true;
+        }
         return true;
     }
 }