diff options
| author | Craig Andrews <candrews@integralblue.com> | 2009-07-17 12:33:56 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2009-07-17 12:33:56 -0400 |
| commit | 3dbbefd5ad63679162659ce736e9e556f2efff21 (patch) | |
| tree | 7ba64f6b02c7f5f0d7d005bc15f7cb729ddf2815 /extlib/Services/oEmbed.php | |
| parent | 9b372f5bb7638d5d9b4e48ae425d921bc8559235 (diff) | |
| parent | 9ed117dc3a405175359d0a541dddfb14cdf15d47 (diff) | |
Merge branch 'oembed-provider' into 0.8.x
Diffstat (limited to 'extlib/Services/oEmbed.php')
| -rw-r--r-- | extlib/Services/oEmbed.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extlib/Services/oEmbed.php b/extlib/Services/oEmbed.php index 5d38ed883..7d507b6f6 100644 --- a/extlib/Services/oEmbed.php +++ b/extlib/Services/oEmbed.php @@ -162,7 +162,7 @@ class Services_oEmbed } if ($this->options[self::OPTION_API] === null) { - $this->options[self::OPTION_API] = $this->discover(); + $this->options[self::OPTION_API] = $this->discover($url); } } @@ -319,7 +319,7 @@ class Services_oEmbed } } - return (isset($ret['json']) ? $ret['json'] : array_pop($ret)); + return (isset($ret['application/json']) ? $ret['application/json'] : array_pop($ret)); } /** |