Fix more fatal errors in queue edge cases

diff --git a/lib/api.php b/lib/api.php
index 794b14050709dddb7d9503a3cad05b829a783cce..10a2fae28c765e4750910a0f2b87f8b4d9d3e47b 100644 (file)
--- a/lib/api.php
+++ b/lib/api.php
@@ -298,7 +298,7 @@ class ApiAction extends Action
             }
         }
 
-        if ($include_user) {
+        if ($include_user && $profile) {
             # Don't get notice (recursive!)
             $twitter_user = $this->twitterUserArray($profile, false);
             $twitter_status['user'] = $twitter_user;

diff --git a/lib/jabberqueuehandler.php b/lib/jabberqueuehandler.php
index 83471f2df7d1789a9fc5c766e73e6cf092b730f9..d6b4b7416a6cdb4320d02d17464e1c8a32cb6420 100644 (file)
--- a/lib/jabberqueuehandler.php
+++ b/lib/jabberqueuehandler.php
@@ -40,7 +40,7 @@ class JabberQueueHandler extends QueueHandler
         try {
             return jabber_broadcast_notice($notice);
         } catch (XMPPHP_Exception $e) {
-            $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
+            common_log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
             return false;
         }
     }

diff --git a/lib/ombqueuehandler.php b/lib/ombqueuehandler.php
index 24896c784c78ed1105bd006afd418fd9e9e99718..1921c2bacdee0d0e06afec9898fde8aaf3cceb93 100644 (file)
--- a/lib/ombqueuehandler.php
+++ b/lib/ombqueuehandler.php
@@ -39,7 +39,7 @@ class OmbQueueHandler extends QueueHandler
     function handle($notice)
     {
         if ($this->is_remote($notice)) {
-            $this->log(LOG_DEBUG, 'Ignoring remote notice ' . $notice->id);
+            common_log(LOG_DEBUG, 'Ignoring remote notice ' . $notice->id);
             return true;
         } else {
             require_once(INSTALLDIR.'/lib/omb.php');

diff --git a/lib/publicqueuehandler.php b/lib/publicqueuehandler.php
index c9edb8d5d79b184bbcf1d2fa045f8c82219e4f5c..a497d13850337d88bf81c6ccb5db6a0bebcf6f4e 100644 (file)
--- a/lib/publicqueuehandler.php
+++ b/lib/publicqueuehandler.php
@@ -38,7 +38,7 @@ class PublicQueueHandler extends QueueHandler
         try {
             return jabber_public_notice($notice);
         } catch (XMPPHP_Exception $e) {
-            $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
+            common_log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
             return false;
         }
     }