From: Roland Haeder <roland@mxchange.org>
Date: Sun, 15 Feb 2015 21:45:04 +0000 (+0100)
Subject: Merge branch 'master' into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ad2dcde798df19510d88c028176742d68d3baa02;p=quix0rs-gnu-social.git

Merge branch 'master' into nightly

Conflicts:
	actions/apiaccountverifycredentials.php
	actions/apimediaupload.php
	actions/logout.php
	actions/public.php

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

ad2dcde798df19510d88c028176742d68d3baa02
diff --cc actions/apiaccountverifycredentials.php
index 4835a2ca63,12daf3e1e6..f82060f547
--- a/actions/apiaccountverifycredentials.php
+++ b/actions/apiaccountverifycredentials.php
@@@ -53,12 -53,11 +53,11 @@@ class ApiAccountVerifyCredentialsActio
       *
       * Check whether the credentials are valid and output the result
       *
-      * @param array $args $_REQUEST data (unused)
       * @return void
       */
-     protected function handle(array $args=array())
+     protected function handle()
      {
 -        parent::handle();
 +        parent::handle($args);
  
          if (!in_array($this->format, array('xml', 'json'))) {
              // TRANS: Client error displayed when coming across a non-supported API method.
diff --cc actions/apimediaupload.php
index 7cc01359d4,8580b209a5..b675478cf6
--- a/actions/apimediaupload.php
+++ b/actions/apimediaupload.php
@@@ -48,14 -48,11 +48,11 @@@ class ApiMediaUploadAction extends ApiA
       * Grab the file from the 'media' param, then store, and shorten
       *
       * @todo Upload throttle!
-      *
-      * @param array $args $_REQUEST data (unused)
-      *
       * @return void
       */
-     protected function handle(array $args=array())
+     protected function handle()
      {
 -        parent::handle();
 +        parent::handle($args);
  
          // Workaround for PHP returning empty $_POST and $_FILES when POST
          // length > post_max_size in php.ini