eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Fix more fatal errors in queue edge cases

Browse Source
This commit is contained in:
Brion Vibber 2010-01-28 23:08:36 -08:00
parent e5eca9bd2c
commit 4d3808a815
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/api.php
View File

@ -298,7 +298,7 @@ class ApiAction extends Action
} }
} }
if ($include_user) { if ($include_user && $profile) {
# Don't get notice (recursive!) # Don't get notice (recursive!)
$twitter_user = $this->twitterUserArray($profile, false); $twitter_user = $this->twitterUserArray($profile, false);
$twitter_status['user'] = $twitter_user; $twitter_status['user'] = $twitter_user;

2
lib/jabberqueuehandler.php
View File

@ -40,7 +40,7 @@ class JabberQueueHandler extends QueueHandler
try { try {
return jabber_broadcast_notice($notice); return jabber_broadcast_notice($notice);
} catch (XMPPHP_Exception $e) { } 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; return false;
} }
} }

2
lib/ombqueuehandler.php
View File

@ -39,7 +39,7 @@ class OmbQueueHandler extends QueueHandler
function handle($notice) function handle($notice)
{ {
if ($this->is_remote($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; return true;
} else { } else {
require_once(INSTALLDIR.'/lib/omb.php'); require_once(INSTALLDIR.'/lib/omb.php');

2
lib/publicqueuehandler.php
View File

@ -38,7 +38,7 @@ class PublicQueueHandler extends QueueHandler
try { try {
return jabber_public_notice($notice); return jabber_public_notice($notice);
} catch (XMPPHP_Exception $e) { } 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; return false;
} }
} }