summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-01-28 23:08:36 -0800
committerBrion Vibber <brion@pobox.com>2010-01-28 23:08:36 -0800
commit4d3808a815dd8a020cf17151e4c04a821790169d (patch)
tree0d07aabf437e7a0ec43dcf5a380535d27595f574 /lib
parente5eca9bd2ce11633e14a840cb93adc6fd3ec8fc0 (diff)
Fix more fatal errors in queue edge cases
Diffstat (limited to 'lib')
-rw-r--r--lib/api.php2
-rw-r--r--lib/jabberqueuehandler.php2
-rw-r--r--lib/ombqueuehandler.php2
-rw-r--r--lib/publicqueuehandler.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/api.php b/lib/api.php
index 794b14050..10a2fae28 100644
--- 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 83471f2df..d6b4b7416 100644
--- 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 24896c784..1921c2bac 100644
--- 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 c9edb8d5d..a497d1385 100644
--- 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;
}
}