X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FFile_redirection.php;h=212cc36158ab3783fd6b72f7fbe9acf13eb28a7f;hb=dff43c03e4cdd76419a430f0942e9eacf30e13b7;hp=a71d1c0831dc984053b1b85c25f5b822fd6c9a8b;hpb=3b7ee5a5f9a2cd3066aff8a7a12d09878be3b06c;p=quix0rs-gnu-social.git diff --git a/classes/File_redirection.php b/classes/File_redirection.php index a71d1c0831..212cc36158 100644 --- 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;