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

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

Browse Source 
Conflicts:
	lib/xmppmanager.php (resolved: code has moved to XmppPlugin.php)
This commit is contained in:
Brion Vibber
2010-05-05 17:11:23 -07:00
parent ddc7811a7b e05415f621
commit 173778eab1
16 changed files with 232 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/Xmpp/XmppPlugin.php
View File

@@ -369,13 +369,13 @@ class XmppPlugin extends ImPlugin
$from = $this->normalize($pl['from']);
if ($pl['type'] != 'chat') {
common_log(LOG_WARNING, "Ignoring message of type ".$pl['type']." from $from.");
return true;
$this->log(LOG_WARNING, "Ignoring message of type ".$pl['type']." from $from: " . $pl['xml']->toString());
return;
}
if (mb_strlen($pl['body']) == 0) {
common_log(LOG_WARNING, "Ignoring message with empty body from $from.");
return true;
$this->log(LOG_WARNING, "Ignoring message with empty body from $from: " . $pl['xml']->toString());
return;
}
$this->handle_incoming($from, $pl['body']);