Add design_id to User_group

[quix0rs-gnu-social.git] / classes / File_redirection.php

diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index a71d1c0831dc984053b1b85c25f5b822fd6c9a8b..212cc36158ab3783fd6b72f7fbe9acf13eb28a7f 100644 (file)
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -133,7 +133,7 @@ class File_redirection extends Memcached_DataObject
         $file->limit(1);
         $file->orderBy('len');
         $file->find(true);
-        if (!empty($file->id)) {
+        if (!empty($file->url) && (strlen($file->url) < strlen($long_url))) {
             return $file->url;
         }
 
@@ -201,7 +201,6 @@ class File_redirection extends Memcached_DataObject
 
         if ($short_url) {
             $short_url = (string)$short_url;
-if(1) {
             // store it
             $file = File::staticGet('url', $long_url);
             if (empty($file)) {
@@ -221,7 +220,6 @@ if(1) {
                 $file_redir->file_id = $file_id;
                 $file_redir->insert();
             }
-}
             return $short_url;
         }
         return $long_url;