summaryrefslogtreecommitdiff
path: root/classes/File_redirection.php
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-05-19 01:08:28 +0000
committerZach Copley <zach@controlyourself.ca>2009-05-19 01:08:28 +0000
commit4186dd2691bf4f6d0ddbf74e385dca00018747be (patch)
treea0a60918127e426ddf1d8d3bd4535d486e0b8b51 /classes/File_redirection.php
parent35b39342337fed5916e06876c8a37068d2052937 (diff)
parent8c5d1b63df63bdf73ef08f8b8c46699089939fc8 (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'classes/File_redirection.php')
-rw-r--r--classes/File_redirection.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index a71d1c083..0eae68178 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -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;