diff options
| author | Eric Helgeson <erichelgeson@gmail.com> | 2009-07-21 09:20:47 -0500 |
|---|---|---|
| committer | Eric Helgeson <erichelgeson@gmail.com> | 2009-07-21 09:20:47 -0500 |
| commit | db19d61e68fcf8398579c2c4968e73db7f7ed93b (patch) | |
| tree | ca64284fb8544823de4a120bca8d45b424fb65b8 /extlib/Services/oEmbed.php | |
| parent | c32e494c0c480e30317b0f0a8dcae7103c4ff89e (diff) | |
| parent | fbb0df9f5436e956c43ace372f625f08628c000f (diff) | |
Merge commit 'origin/0.8.x' into 0.9.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)); } /** |