Merge branch '1.1.x'

diff --git a/plugins/OStatus/actions/ostatusgroup.php b/plugins/OStatus/actions/ostatusgroup.php
index e2c4121c3f5b04d6cee91a443fedd8e0df6122f7..2c8e318c1f439ee4a1fadf696d71934d35c5c3de 100644 (file)
--- a/plugins/OStatus/actions/ostatusgroup.php
+++ b/plugins/OStatus/actions/ostatusgroup.php
@@ -150,6 +150,8 @@ class OStatusGroupAction extends OStatusSubAction
             $this->showForm(_m('Remote group join failed!'));
             return;
         }
+
+        $this->success();
     }
 
     /**

diff --git a/plugins/QnA/actions/qnashowquestion.php b/plugins/QnA/actions/qnashowquestion.php
index edea032b388486c98d0e689b5d003ac226ef2d17..ca2cb74ba1d751c2279b4c5db7007a39f154b02d 100644 (file)
--- a/plugins/QnA/actions/qnashowquestion.php
+++ b/plugins/QnA/actions/qnashowquestion.php
@@ -115,13 +115,7 @@ class QnashowquestionAction extends ShownoticeAction
         }
 
         if (count($answerIds) > 0) {
-            $notice = new Notice();
-            $notice->query(
-                sprintf(
-                    'SELECT notice.* FROM notice WHERE notice.id IN (%s)',
-                    implode(',', $answerIds)
-                )
-            );
+            $notice = Notice::multiGet('id', $answerIds);
 
             $nli = new NoticeList($notice, $this);
             $nli->show();

diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 50950d85709b7808001c1c8f57b4954b35145174..0f82ed041c8685ba5461ca9f910b5ea2a34e21c4 100644 (file)
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/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']);

diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index bc1230e64505ec2f23668a099ae4fbb767485b95..45a7d5cc8b6cc1055a17354ab197549c4e78b42c 100755 (executable)
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -23,8 +23,8 @@
 SDIR=`dirname $0`
 DIR=`php $SDIR/getpiddir.php`
 
-for f in ombhandler smshandler pinghandler \
-        twitterhandler facebookhandler \
+for f in ombhandler smshandler pinghandler queuedaemon \
+        twitterhandler facebookhandler imdaemon \
         twitterstatusfetcher synctwitterfriends pluginhandler rsscloudhandler; do
 
        FILES="$DIR/$f.*.pid"