Local_group and User are now assumed to be in same namespace

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.
@@ -46,7 +44,7 @@ class PluginQueueHandler extends QueueHandler
     {
         try {
             Event::handle('HandleQueuedNotice', array(&$notice));
-        } catch (UserNoProfileException $unp) {
+        } catch (NoProfileException $unp) {
             // We can't do anything about this, so just skip
             return true;
         }