From: Roland Haeder <roland@mxchange.org>
Date: Thu, 19 Feb 2015 19:38:05 +0000 (+0100)
Subject: Merge branch 'nightly' of gitorious.org:social/mainline into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7b0265eb37e8b80803386094a96b46c9b3b1c014;p=quix0rs-gnu-social.git

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

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

7b0265eb37e8b80803386094a96b46c9b3b1c014
diff --cc classes/File_redirection.php
index 292e6372a6,9309642553..f2d2454095
--- a/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']);