diff options
author | Evan Prodromou <evan@status.net> | 2009-10-01 11:30:04 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-10-01 11:30:04 -0400 |
commit | a41ed1a66a902b078876be7528183ab61e6a3d03 (patch) | |
tree | db690c52820ebd4aefae6222cb4f3b48c2d9398f /classes/File.php | |
parent | 3449843f839b6c17618b27b031c608860761cd32 (diff) | |
parent | acc78972383c2346b5729192ab00c90c48c5b2a6 (diff) |
Merge branch '0.9.x' into schema
Diffstat (limited to 'classes/File.php')
-rw-r--r-- | classes/File.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/classes/File.php b/classes/File.php index 9758cf7f5..e04a9d525 100644 --- a/classes/File.php +++ b/classes/File.php @@ -94,7 +94,13 @@ class File extends Memcached_DataObject $file_redir = File_redirection::staticGet('url', $given_url); if (empty($file_redir)) { $redir_data = File_redirection::where($given_url); - $redir_url = $redir_data['url']; + if (is_array($redir_data)) { + $redir_url = $redir_data['url']; + } elseif (is_string($redir_data)) { + $redir_url = $redir_data; + } else { + throw new ServerException("Can't process url '$given_url'"); + } // TODO: max field length if ($redir_url === $given_url || strlen($redir_url) > 255) { $x = File::saveNew($redir_data, $given_url); |