From: Roland Häder <haeder@hmmdeutschland.de>
Date: Fri, 16 Jan 2015 09:56:00 +0000 (+0100)
Subject: Merge branch 'master' of gitorious.org:social/mainline into social-master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=996345088e8d57cf39fa38129ab50ff02918a275;p=quix0rs-gnu-social.git

Merge branch 'master' of gitorious.org:social/mainline into social-master

Conflicts:
	actions/atompubmembershipfeed.php
	actions/atompubshowmembership.php
	actions/atompubsubscriptionfeed.php
	plugins/OStatus/actions/peopletagsalmon.php
	plugins/OStatus/classes/Ostatus_profile.php
	plugins/OStatus/lib/salmonaction.php
	scripts/stopdaemons.sh

Signed-off-by: Roland Häder <haeder@hmmdeutschland.de>
---

996345088e8d57cf39fa38129ab50ff02918a275
diff --cc plugins/OStatus/lib/salmonaction.php
index bb3a6180d8,5e7d8f35a3..eb68632d38
--- a/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@@ -60,8 -66,8 +66,8 @@@ class SalmonAction extends Actio
          }
  
          // Cryptographic verification test
-         if (!$magic_env->verify($profile)) {
+         if (!$magic_env->verify($this->actor)) {
 -            common_log(LOG_DEBUG, "Salmon signature verification failed.");
 +            common_debug("Salmon signature verification failed.");
              // TRANS: Client error.
              $this->clientError(_m('Salmon signature verification failed.'));
          }
diff --cc scripts/stopdaemons.sh
index b4a3725d8d,e725dd0bf0..274f0903e2
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@@ -31,9 -39,9 +39,9 @@@ if [ $# -gt 1 ]; the
  fi
  
  SDIR=`dirname $0`
 -DIR=`php $SDIR/getpiddir.php $SITE`
 +DIR=`$SDIR/getpiddir.php $SITE`
  
- DAEMONS=`$SDIR/getvaliddaemons.php`
 -DAEMONS=`php $SDIR/getvaliddaemons.php $ARGSG`
++DAEMONS=`$SDIR/getvaliddaemons.php $ARGSG`
  
  for f in $DAEMONS; do
      f=$(basename $f .php)