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

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

diff --cc classes/File.php
Simple merge

diff --cc classes/File_redirection.php
index 292e6372a65374687385e2180254c57849ff4077,9309642553b0de545a4da26291376018500c5bbc..f2d2454095497bca183646acbb6c0b6bffa44055
--- 1/classes/File_redirection.php
--- 2/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@@ -332,8 -346,9 +346,9 @@@ class File_redirection extends Managed_
          return $out_url;
      }
  
 -    function saveNew($data, $file_id, $url) {
 +    function saveNew(array $data, $file_id, $url) {
          $file_redir = new File_redirection;
+         $file_redir->urlhash = File::hashurl($short_url);
          $file_redir->url = $url;
          $file_redir->file_id = $file_id;
          $file_redir->redirections = intval($data['redirects']);

diff --cc classes/File_thumbnail.php
Simple merge

diff --cc lib/schemaupdater.php
Simple merge

diff --cc plugins/OStatus/classes/Ostatus_profile.php
Simple merge