summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-07-15 17:09:11 -0400
committerCraig Andrews <candrews@integralblue.com>2009-07-15 17:09:11 -0400
commitf75932601c08cdbdf68fddc7b5f9871b64d841ec (patch)
tree9bcd1851c4958d5f47db1b387b8cbda2ea840382
parent6308539c1d669ad0b6072b48deeaa95969ebe318 (diff)
Fixed bugs in oEmbed library's discovery routines
-rw-r--r--extlib/Services/oEmbed.php4
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));
}
/**