summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-12 10:50:46 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-08-12 10:50:46 -0700
commit7d33478e867cc6610aded42a8f2fa71bae46804d (patch)
tree73a422fac7006ee40ff51c21922ca22f68cab40d /classes
parent01dccefcccc8ca4c1fec419f47cf723d0498c3ef (diff)
parent853b6d38b362e3a905195d9ff850c9a884d412bd (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
Diffstat (limited to 'classes')
-rw-r--r--classes/File.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/classes/File.php b/classes/File.php
index 959301eda..b2c510340 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -95,7 +95,8 @@ class File extends Memcached_DataObject
if (empty($file_redir)) {
$redir_data = File_redirection::where($given_url);
$redir_url = $redir_data['url'];
- if ($redir_url === $given_url) {
+ // TODO: max field length
+ if ($redir_url === $given_url || strlen($redir_url) > 255) {
$x = File::saveNew($redir_data, $given_url);
$file_id = $x->id;
} else {