diff options
| author | Evan Prodromou <evan@status.net> | 2009-09-15 17:16:35 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-09-15 17:16:35 -0400 |
| commit | 13147143fc830e81b80ae86bf4cc4f745ce04381 (patch) | |
| tree | 7197e7c3437e028a1bc2358f38ac3964cf3fe6e9 /classes/File.php | |
| parent | e559f82e86c495abdc4cf5fff3d8c6279a808354 (diff) | |
| parent | 4081ed79b02fd06f7c347803478e1f835311c2ab (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'classes/File.php')
| -rw-r--r-- | classes/File.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/classes/File.php b/classes/File.php index dc668ab23..9758cf7f5 100644 --- a/classes/File.php +++ b/classes/File.php @@ -78,14 +78,14 @@ class File extends Memcached_DataObject $file_id = $x->insert(); if (isset($redir_data['type']) - && ('text/html' === substr($redir_data['type'], 0, 9)) + && (('text/html' === substr($redir_data['type'], 0, 9) || 'application/xhtml+xml' === substr($redir_data['type'], 0, 21))) && ($oembed_data = File_oembed::_getOembed($given_url))) { File_oembed::saveNew($oembed_data, $file_id); } return $x; } - function processNew($given_url, $notice_id) { + function processNew($given_url, $notice_id=null) { if (empty($given_url)) return -1; // error, no url to process $given_url = File_redirection::_canonUrl($given_url); if (empty($given_url)) return -1; // error, no url to process @@ -96,7 +96,7 @@ class File extends Memcached_DataObject $redir_data = File_redirection::where($given_url); $redir_url = $redir_data['url']; // TODO: max field length - if ($redir_url === $given_url || strlen($redir_url) > 255) { + if ($redir_url === $given_url || strlen($redir_url) > 255) { $x = File::saveNew($redir_data, $given_url); $file_id = $x->id; } else { @@ -119,7 +119,9 @@ class File extends Memcached_DataObject } } - File_to_post::processNew($file_id, $notice_id); + if (!empty($notice_id)) { + File_to_post::processNew($file_id, $notice_id); + } return $x; } |