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

Conflicts:
	actions/apiaccountverifycredentials.php
	actions/apimediaupload.php
	actions/public.php
	actions/register.php
	plugins/OStatus/scripts/update_ostatus_profiles.php
	plugins/OpportunisticQM/lib/opportunisticqueuemanager.php

Signed-off-by: Roland Häder <haeder@hmmdeutschland.de>

diff --cc actions/apiaccountverifycredentials.php
index dfa366cbb61f492f0eede95beb7411c9a5d28763,9b98fa6d810ba384fbea24599c7f47ae4285c3bc..4835a2ca63f0018171a98b2c3b89ce9a50c2e883
--- 1/actions/apiaccountverifycredentials.php
--- 2/actions/apiaccountverifycredentials.php
+++ b/actions/apiaccountverifycredentials.php
@@@ -48,17 -48,9 +48,17 @@@ if (!defined('STATUSNET')) 
   */
  class ApiAccountVerifyCredentialsAction extends ApiAuthAction
  {
 -    protected function handle()
 +    /**
 +     * Handle the request
 +     *
 +     * Check whether the credentials are valid and output the result
 +     *
 +     * @param array $args $_REQUEST data (unused)
 +     * @return void
 +     */
-     function handle(array $args=array())
++    protected function handle(array $args=array())
      {
 -        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 14c26d238f677f2cb0d92464e9d5613ae2db1655,2d81af157e06362db885ca5f62fb3643babcce7d..a3703fad060f5419afaf6342499210498564d890
--- 1/actions/apimediaupload.php
--- 2/actions/apimediaupload.php
+++ b/actions/apimediaupload.php
@@@ -53,18 -53,10 +53,10 @@@ class ApiMediaUploadAction extends ApiA
       *
       * @return void
       */
-     function handle(array $args=array())
 -    protected function handle()
++    protected function handle(array $args=array())
      {
 -        parent::handle();
 +        parent::handle($args);
  
-         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-             $this->clientError(
-                 // TRANS: Client error. POST is a HTTP command. It should not be translated.
-                 _('This method requires a POST.'),
-                 400, $this->format
-             );
-         }
- 
          // Workaround for PHP returning empty $_POST and $_FILES when POST
          // length > post_max_size in php.ini
  

diff --cc actions/public.php
index 8e5da476466a93f36203917cf319e9c726ad4e31,52bab072aec60ea5172f0e432e3a9829b3218383..193365309f9fb0e1f1035e8ffac63cee3fc0f602
--- 1/actions/public.php
--- 2/actions/public.php
+++ b/actions/public.php
@@@ -53,9 -53,10 +53,10 @@@ class PublicAction extends Actio
  
      var $page = null;
      var $notice;
-     var $userProfile = null;
+ 
+     protected $stream = null;
  
 -    function isReadOnly($args)
 +    function isReadOnly(array $args=array())
      {
          return true;
      }
@@@ -115,9 -117,9 +117,9 @@@
       *
       * @return void
       */
-     function handle(array $args=array())
 -    protected function handle()
++    protected function handle(array $args=array())
      {
-         parent::handle($args);
+         parent::handle();
  
          $this->showPage();
      }

diff --cc actions/register.php
Simple merge

diff --cc lib/action.php
Simple merge

diff --cc lib/default.php
Simple merge

diff --cc lib/router.php
Simple merge

diff --cc lib/util.php
Simple merge

diff --cc plugins/OStatus/classes/Ostatus_profile.php
index d698ba81a36339c56c315ef9bbb1310d8f157f11,2fb869e2f3bafef92ed4d90666cdb732cbabfe5c..4081edadaa6a7b847580462f5b5c2aabbc64d89d
--- 1/plugins/OStatus/classes/Ostatus_profile.php
--- 2/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@@ -1261,12 -1260,17 +1261,17 @@@ class Ostatus_profile extends Managed_D
  
          // @todo FIXME: This should be better encapsulated
          // ripped from oauthstore.php (for old OMB client)
 -        $temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
 +        $temp_filename = tempnam(common_get_temp_dir(), 'listener_avatar');
          try {
-             if (!copy($url, $temp_filename)) {
+             $client = new HTTPClient();
+             $response = $client->get($url);
+ 
+             if (!$response->isOk()) {
                  // TRANS: Server exception. %s is a URL.
 -                throw new ServerException(sprintf(_m('Unable to fetch avatar from %s.'), $url));
 +                throw new ServerException(sprintf(_m('Unable to fetch avatar from %s to %s.'), $url, $temp_filename));
              }
+             // FIXME: make sure it's an image here instead of _after_ writing to a file?
+             file_put_contents($temp_filename, $response->getBody());
  
              if ($this->isGroup()) {
                  $id = $this->group_id;

diff --cc plugins/OStatus/scripts/testfeed.php
Simple merge

diff --cc plugins/OStatus/scripts/update_ostatus_profiles.php
Simple merge