Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
	plugins/OpenID/openid.php

1 files changed, 2 insertions, 3 deletions

diff --git a/lib/util.php b/lib/util.php
index 524ce0071..2a90b56a9 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1249,9 +1249,8 @@ function common_enqueue_notice($notice)
         $transports[] = 'jabber';
     }
 
-    // @fixme move these checks into QueueManager and/or individual handlers
-    if ($notice->is_local == Notice::LOCAL_PUBLIC ||
-        $notice->is_local == Notice::LOCAL_NONPUBLIC) {
+    // We can skip these for gatewayed notices.
+    if ($notice->isLocal()) {
         $transports = array_merge($transports, $localTransports);
         if ($xmpp) {
             $transports[] = 'public';