From: Roland Haeder <roland@mxchange.org>
Date: Fri, 3 Jul 2015 20:21:00 +0000 (+0200)
Subject: Merge branch 'master' of https://git.gnu.io/gnu/gnu-social into social-master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b22acbb42e2cefa4c3d94f192b735519b1182f07;p=quix0rs-gnu-social.git

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
---

b22acbb42e2cefa4c3d94f192b735519b1182f07
diff --cc classes/File_redirection.php
index a9d35cbd8e,ba516e4623..388fb8b575
--- a/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 extlib/DB/DataObject.php
index 684a98c92a,1a7b34665d..1a7b34665d
mode 100644,100755..100644
--- a/extlib/DB/DataObject.php
+++ b/extlib/DB/DataObject.php
diff --cc lib/apiaction.php
index 0eea08bed6,724447f120..724447f120
mode 100644,100755..100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
diff --cc lib/profileaction.php
index 3da3c11246,7161f0d4a3..1cda2b5094
--- a/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 plugins/AntiBrute/AntiBrutePlugin.php
index 365937fedf,c2291cbf1d..c2291cbf1d
mode 100644,100755..100644
--- a/plugins/AntiBrute/AntiBrutePlugin.php
+++ b/plugins/AntiBrute/AntiBrutePlugin.php
diff --cc plugins/OpenID/actions/publicxrds.php
index 0000000000,25801e7861..eaeb84147d
mode 000000,100644..100644
--- a/plugins/OpenID/actions/publicxrds.php
+++ b/plugins/OpenID/actions/publicxrds.php
@@@ -1,0 -1,77 +1,77 @@@
+ <?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($args)
++    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 scroller_plugin
index 5d38f65bb9,0000000000..5ee9a41671
mode 160000,000000..160000
--- a/scroller_plugin
+++ b/scroller_plugin
@@@ -1,1 -1,0 +1,1 @@@
- Subproject commit 5d38f65bb9c791b341a5516d95cd471a4e5cec23
++Subproject commit 5ee9a41671e42e25b938bcc19bb041c42d73ce4d