Merge commit 'br3nda/0.8.x-pgfixes' into 0.8.x

[quix0rs-gnu-social.git] / extlib / Services / oEmbed.php

diff --git a/extlib/Services/oEmbed.php b/extlib/Services/oEmbed.php
index 5d38ed883d50fb6e5e5333691032f9d53cea55ca..7d507b6f622cea9ada872dbe1cde3c4e020586ba 100644 (file)
--- 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));
     }
 
     /**