Merge branch '1.1.x'

plugins/OStatus/actions/ostatusgroup.php

@@ -150,6 +150,8 @@ class OStatusGroupAction extends OStatusSubAction
             $this->showForm(_m('Remote group join failed!'));
             return;
         }
+
+        $this->success();
     }
 
     /**

plugins/QnA/actions/qnashowquestion.php

@@ -115,13 +115,7 @@ class QnashowquestionAction extends ShownoticeAction
         }
 
         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->show();

plugins/Xmpp/XmppPlugin.php

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

scripts/stopdaemons.sh

@@ -23,8 +23,8 @@
 SDIR=`dirname $0`
 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
 
 	FILES="$DIR/$f.*.pid"