From f75932601c08cdbdf68fddc7b5f9871b64d841ec Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 15 Jul 2009 17:09:11 -0400
Subject: Fixed bugs in oEmbed library's discovery routines

---
 extlib/Services/oEmbed.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'extlib/Services/oEmbed.php')

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));
     }
 
     /**
-- 
cgit v1.2.3-54-g00ecf