diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-06-17 23:56:42 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-06-17 23:56:42 -0700 |
| commit | 79e732bd03c020eab36ceb13c5a712e76df3ac75 (patch) | |
| tree | 48cd2d1b916a8f53beefa6c856677eb5278921f1 /classes/File.php | |
| parent | 19d39b20294bad8dc14df26e76756c558a5083cf (diff) | |
| parent | c14c9e1a086f0de29ef5c37fbeb34f6082b1c5ef (diff) | |
Merge branch '0.8.x' into twitterpriv
Diffstat (limited to 'classes/File.php')
| -rw-r--r-- | classes/File.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/classes/File.php b/classes/File.php index 24ab11b8e..08320faf8 100644 --- a/classes/File.php +++ b/classes/File.php @@ -79,7 +79,6 @@ class File extends Memcached_DataObject && ('text/html' === substr($redir_data['type'], 0, 9)) && ($oembed_data = File_oembed::_getOembed($given_url)) && isset($oembed_data['json'])) { - File_oembed::saveNew($oembed_data['json'], $file_id); } return $x; @@ -98,7 +97,6 @@ class File extends Memcached_DataObject if ($redir_url === $given_url) { $x = File::saveNew($redir_data, $given_url); $file_id = $x->id; - } else { $x = File::processNew($redir_url, $notice_id); $file_id = $x->id; |