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>

diff --cc actions/apifriendshipsexists.php
Simple merge

diff --cc actions/apifriendshipsshow.php
Simple merge

diff --cc actions/apitimelineretweetedtome.php
Simple merge

diff --cc actions/apitimelineuser.php
Simple merge

diff --cc lib/activityimporter.php
Simple merge

diff --cc lib/default.php
Simple merge

diff --cc lib/installer.php
Simple merge

diff --cc lib/util.php
Simple merge

diff --cc plugins/Directory/actions/groupdirectory.php
index a4bd1f55e83c6c2aebb264ae12858bd319595fe8,32e5ce50b4cdeb483831da0d9c3b150f4d7cfad4..8dcad7db2ecb4af5eddefcd104999b3ef9bba046
--- 1/plugins/Directory/actions/groupdirectory.php
--- 2/plugins/Directory/actions/groupdirectory.php
+++ b/plugins/Directory/actions/groupdirectory.php
@@@ -138,17 -134,8 +134,15 @@@ class GroupdirectoryAction extends Mana
          return true;
      }
  
-     function prepare(array $args=array())
 +    /**
 +     * Take arguments for running
 +     *
 +     * @param array $args $_REQUEST args
 +     *
 +     * @return boolean success flag
 +     */
+     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 24bdd5c9fa848e7eddadc6d16bea206d81806ff6,f178408e8bf11596d067fb5501ad1ead7c843956..e68166dd654eddd181afcc36fd2114ef6a22e494
--- 1/plugins/Directory/actions/userdirectory.php
--- 2/plugins/Directory/actions/userdirectory.php
+++ b/plugins/Directory/actions/userdirectory.php
@@@ -137,17 -132,8 +132,15 @@@ class UserdirectoryAction extends Manag
          return true;
      }
  
-     function prepare(array $args=array())
 +    /**
 +     * Take arguments for running
 +     *
 +     * @param array $args $_REQUEST args
 +     *
 +     * @return boolean success flag
 +     */
+     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/OStatus/classes/Ostatus_profile.php
Simple merge

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