summaryrefslogtreecommitdiff
path: root/classes/File.php
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-07-17 12:33:56 -0400
committerCraig Andrews <candrews@integralblue.com>2009-07-17 12:33:56 -0400
commit3dbbefd5ad63679162659ce736e9e556f2efff21 (patch)
tree7ba64f6b02c7f5f0d7d005bc15f7cb729ddf2815 /classes/File.php
parent9b372f5bb7638d5d9b4e48ae425d921bc8559235 (diff)
parent9ed117dc3a405175359d0a541dddfb14cdf15d47 (diff)
Merge branch 'oembed-provider' into 0.8.x
Diffstat (limited to 'classes/File.php')
-rw-r--r--classes/File.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/classes/File.php b/classes/File.php
index 56d9f9827..68d385d1e 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -79,9 +79,8 @@ class File extends Memcached_DataObject
if (isset($redir_data['type'])
&& ('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);
+ && ($oembed_data = File_oembed::_getOembed($given_url))) {
+ File_oembed::saveNew($oembed_data, $file_id);
}
return $x;
}