Merge branch 'master' of https://git.gnu.io/gnu/gnu-social into social-master

+ kept type-hint 'array' for $data parameter (long tested and working).

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
	actions/apiaccountratelimitstatus.php
	actions/public.php
	actions/userbyid.php
	classes/File_redirection.php
	lib/apioauthaction.php
	lib/clienterroraction.php
	lib/servererroraction.php
	plugins/OpenID/actions/publicxrds.php
	plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php

diff --cc actions/apiaccountratelimitstatus.php
Simple merge

diff --cc actions/apiconversation.php
Simple merge

diff --cc actions/apitimelinetag.php
Simple merge

diff --cc actions/recoverpassword.php
Simple merge

diff --cc actions/replies.php
Simple merge

diff --cc actions/tag.php
Simple merge

diff --cc actions/tagrss.php
Simple merge

diff --cc classes/File_redirection.php
index a9d35cbd8e66f936ec906516ee4fc0078390df46,ba516e462325698847294a89cf965bb7f395b214..388fb8b5759e806bb1ef28feea72a0a40e92435f
--- 1/classes/File_redirection.php
--- 2/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@@ -347,7 -342,7 +342,7 @@@ class File_redirection extends Managed_
          return $out_url;
      }
  
-     function saveNew(array $data, $file_id, $url) {
 -    static function saveNew($data, $file_id, $url) {
++    static function saveNew(array $data, $file_id, $url) {
          $file_redir = new File_redirection;
          $file_redir->urlhash = File::hashurl($short_url);
          $file_redir->url = $url;

diff --cc classes/File_thumbnail.php
Simple merge

diff --cc classes/Memcached_DataObject.php
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc classes/Notice_tag.php
Simple merge

diff --cc extlib/DB/DataObject.php
index 684a98c92a4c3a1e42edf8ba37ac88a5d4eb20e7,1a7b34665d174224ef50528dd4355b9e348cbdf7..1a7b34665d174224ef50528dd4355b9e348cbdf7
mode 100644,100755..100644
--- 1/extlib/DB/DataObject.php
--- 2/extlib/DB/DataObject.php
+++ b/extlib/DB/DataObject.php

diff --cc lib/action.php
Simple merge

diff --cc lib/apiaction.php
index 0eea08bed63f147a4c05b1edaec6fbfc68793cd2,724447f120cbadc7df1c66bd09ee095d597ba0fb..724447f120cbadc7df1c66bd09ee095d597ba0fb
mode 100644,100755..100644
--- 1/lib/apiaction.php
--- 2/lib/apiaction.php
+++ b/lib/apiaction.php

diff --cc lib/apioauthaction.php
Simple merge

diff --cc lib/default.php
Simple merge

diff --cc lib/framework.php
Simple merge

diff --cc lib/implugin.php
Simple merge

diff --cc lib/installer.php
Simple merge

diff --cc lib/profileaction.php
index 3da3c11246d3e7997ffbd098232c0dac8246a58c,7161f0d4a3b90eb08af9f95ef928d5ae823ea6bb..1cda2b509422f451db256b7d2adf97da25c8adcc
--- 1/lib/profileaction.php
--- 2/lib/profileaction.php
+++ b/lib/profileaction.php
@@@ -109,10 -80,15 +80,15 @@@ abstract class ProfileAction extends Ma
  
      protected function profileActionPreparation()
      {
-         // No-op by default.
+         // Nothing to do by default.
+     }
+ 
+     public function getTarget()
+     {
+         return $this->target;
      }
  
 -    function isReadOnly($args)
 +    function isReadOnly(array $args=array())
      {
          return true;
      }

diff --cc lib/profileminilist.php
Simple merge

diff --cc lib/publictagcloudsection.php
Simple merge

diff --cc lib/urlmapper.php
Simple merge

diff --cc lib/util.php
Simple merge

diff --cc plugins/AntiBrute/AntiBrutePlugin.php
index 365937fedf9bf4d1a6c27bbfbce31e8d1d946415,c2291cbf1da18c27be1f5d6882101222248a8c06..c2291cbf1da18c27be1f5d6882101222248a8c06
mode 100644,100755..100644
--- 1/plugins/AntiBrute/AntiBrutePlugin.php
--- 2/plugins/AntiBrute/AntiBrutePlugin.php
+++ b/plugins/AntiBrute/AntiBrutePlugin.php

diff --cc plugins/Directory/DirectoryPlugin.php
Simple merge

diff --cc plugins/Favorite/classes/Fave.php
Simple merge

diff --cc plugins/ModPlus/ModPlusPlugin.php
Simple merge

diff --cc plugins/OStatus/OStatusPlugin.php
Simple merge

diff --cc plugins/OStatus/classes/Ostatus_profile.php
Simple merge

diff --cc plugins/OStatus/lib/salmonaction.php
Simple merge

diff --cc plugins/OStatus/scripts/update-profile.php
Simple merge

diff --cc plugins/Oembed/classes/File_oembed.php
Simple merge

diff --cc plugins/OpenID/OpenIDPlugin.php
Simple merge

diff --cc plugins/OpenID/actions/publicxrds.php
index 0000000000000000000000000000000000000000,25801e7861cb1d3798f26141e6d5128890021100..eaeb84147db9474fe9a716e73a2150b7fa8e471b
mode 000000,100644..100644
--- /dev/null
--- 2/plugins/OpenID/actions/publicxrds.php
+++ b/plugins/OpenID/actions/publicxrds.php
@@@ -1,0 -1,77 +1,77 @@@
 -    function isReadOnly($args)
+ <?php
+ /**
+  * Public XRDS for OpenID
+  *
+  * PHP version 5
+  *
+  * @category Action
+  * @package  StatusNet
+  * @author   Evan Prodromou <evan@status.net>
+  * @author   Craig Andrews <candrews@integralblue.com>
+  * @author   Robin Millette <millette@status.net>
+  * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+  * @link     http://status.net/
+  *
+  * StatusNet - the distributed open-source microblogging tool
+  * Copyright (C) 2008, 2009, StatusNet, Inc.
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU Affero General Public License as published by
+  * the Free Software Foundation, either version 3 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU Affero General Public License for more details.
+  *
+  * You should have received a copy of the GNU Affero General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ if (!defined('GNUSOCIAL')) { exit(1); }
+ 
+ require_once __DIR__.'/../openid.php';
+ 
+ /**
+  * Public XRDS
+  *
+  * @category Action
+  * @package  StatusNet
+  * @author   Evan Prodromou <evan@status.net>
+  * @author   Robin Millette <millette@status.net>
+  * @author   Craig Andrews <candrews@integralblue.com>
+  * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+  * @link     http://status.net/
+  */
+ class PublicxrdsAction extends Action
+ {
+     /**
+      * Is read only?
+      *
+      * @return boolean true
+      */
++    function isReadOnly(array $args=array())
+     {
+         return true;
+     }
+ 
+     /**
+      * Class handler.
+      *
+      * @param array $args array of arguments
+      *
+      * @return nothing
+      */
+     protected function handle()
+     {
+         parent::handle();
+         $xrdsOutputter = new XRDSOutputter();
+         $xrdsOutputter->startXRDS();
+         Event::handle('StartPublicXRDS', array($this,&$xrdsOutputter));
+         Event::handle('EndPublicXRDS', array($this,&$xrdsOutputter));
+         $xrdsOutputter->endXRDS();
+     }
+ }

diff --cc plugins/QnA/QnAPlugin.php
Simple merge

diff --cc plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
Simple merge

diff --cc plugins/WebFinger/WebFingerPlugin.php
Simple merge

diff --cc plugins/Xmpp/XmppPlugin.php
Simple merge

diff --cc scripts/console.php
Simple merge

diff --cc scroller_plugin
index 5d38f65bb9c791b341a5516d95cd471a4e5cec23,0000000000000000000000000000000000000000..5ee9a41671e42e25b938bcc19bb041c42d73ce4d
mode 160000,000000..160000
--- 1/scroller_plugin
--- /dev/null
+++ b/scroller_plugin
@@@ -1,1 -1,0 +1,1 @@@
- Subproject commit 5d38f65bb9c791b341a5516d95cd471a4e5cec23
++Subproject commit 5ee9a41671e42e25b938bcc19bb041c42d73ce4d