eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'oembed-provider' into 0.8.x

Browse Source
This commit is contained in:
Craig Andrews
2009-07-17 12:33:56 -04:00
parent 9b372f5bb7 9ed117dc3a
commit 3dbbefd5ad
9 changed files with 88 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extlib/Services/oEmbed.php
View File

@@ -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));
}
/**