GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Prodromou 2012-07-28 13:55:10 -04:00
commit f04452c70a
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/QnA/actions/qnashowquestion.php
View File

@ -115,13 +115,7 @@ class QnashowquestionAction extends ShownoticeAction
} }
if (count($answerIds) > 0) { if (count($answerIds) > 0) {
$notice = new Notice(); $notice = Notice::multiGet('id', $answerIds);
$notice->query(
sprintf(
'SELECT notice.* FROM notice WHERE notice.id IN (%s)',
implode(',', $answerIds)
)
);
$nli = new NoticeList($notice, $this); $nli = new NoticeList($notice, $this);
$nli->show(); $nli->show();

4
plugins/Xmpp/XmppPlugin.php
View File

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

4
scripts/stopdaemons.sh
View File

@ -23,8 +23,8 @@
SDIR=`dirname $0` SDIR=`dirname $0`
DIR=`php $SDIR/getpiddir.php` DIR=`php $SDIR/getpiddir.php`
for f in ombhandler smshandler pinghandler \ for f in ombhandler smshandler pinghandler queuedaemon \
twitterhandler facebookhandler \ twitterhandler facebookhandler imdaemon \
twitterstatusfetcher synctwitterfriends pluginhandler rsscloudhandler; do twitterstatusfetcher synctwitterfriends pluginhandler rsscloudhandler; do
FILES="$DIR/$f.*.pid" FILES="$DIR/$f.*.pid"