From: Roland Haeder <roland@mxchange.org>
Date: Wed, 18 Feb 2015 15:47:11 +0000 (+0100)
Subject: Merge branch 'nightly' of gitorious.org:social/mainline into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c641aabd6f1d61320054238d7b136e9c7e315064;p=quix0rs-gnu-social.git

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

Conflicts:
	actions/apifriendshipsdestroy.php
	actions/apifriendshipsexists.php
	actions/apifriendshipsshow.php
	actions/apitimelineretweetedtome.php
	plugins/Directory/actions/groupdirectory.php
	plugins/Directory/actions/userdirectory.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
---

c641aabd6f1d61320054238d7b136e9c7e315064
diff --cc plugins/Directory/actions/groupdirectory.php
index a4bd1f55e8,32e5ce50b4..8dcad7db2e
--- a/plugins/Directory/actions/groupdirectory.php
+++ b/plugins/Directory/actions/groupdirectory.php
@@@ -138,17 -134,8 +134,15 @@@ class GroupdirectoryAction extends Mana
          return true;
      }
  
 +    /**
 +     * Take arguments for running
 +     *
 +     * @param array $args $_REQUEST args
 +     *
 +     * @return boolean success flag
 +     */
-     function prepare(array $args=array())
+     protected function doPreparation()
      {
-         parent::prepare($args);
- 
          $this->page    = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
          $this->filter  = $this->arg('filter', 'all');
          $this->reverse = $this->boolean('reverse');
diff --cc plugins/Directory/actions/userdirectory.php
index 24bdd5c9fa,f178408e8b..e68166dd65
--- a/plugins/Directory/actions/userdirectory.php
+++ b/plugins/Directory/actions/userdirectory.php
@@@ -137,17 -132,8 +132,15 @@@ class UserdirectoryAction extends Manag
          return true;
      }
  
 +    /**
 +     * Take arguments for running
 +     *
 +     * @param array $args $_REQUEST args
 +     *
 +     * @return boolean success flag
 +     */
-     function prepare(array $args=array())
+     protected function doPreparation()
      {
-         parent::prepare($args);
- 
          $this->page    = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
          $this->filter  = $this->arg('filter', 'all');
          $this->reverse = $this->boolean('reverse');