diff options
| author | Sarven Capadisli <csarven@controlyourself.ca> | 2009-06-25 19:00:26 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@controlyourself.ca> | 2009-06-25 19:00:26 +0000 |
| commit | 28b4e85af0e230e8399d8cc2098ed6150afdead6 (patch) | |
| tree | 1560f257c674e4e3f8ab4a588fac3bf59377a9db /classes/File.php | |
| parent | 0eb77e67532cbbdfd1f099303ae8e1614296b87a (diff) | |
| parent | c96572c0909793fd1f38def21f2577e13d98766d (diff) | |
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'classes/File.php')
| -rw-r--r-- | classes/File.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/classes/File.php b/classes/File.php index b98c9e665..5dd7cd865 100644 --- a/classes/File.php +++ b/classes/File.php @@ -91,9 +91,10 @@ class File extends Memcached_DataObject $given_url = File_redirection::_canonUrl($given_url); if (empty($given_url)) return -1; // error, no url to process $file = File::staticGet('url', $given_url); - if (empty($file->id)) { + if (empty($file)) { $file_redir = File_redirection::staticGet('url', $given_url); - if (empty($file_redir->id)) { + if (empty($file_redir)) { + common_debug("processNew() '$given_url' not a known redirect.\n"); $redir_data = File_redirection::where($given_url); $redir_url = $redir_data['url']; if ($redir_url === $given_url) { |