Merge branch 'pull'

This commit is contained in:
friendica 2012-02-17 10:13:34 -08:00
commit 184f6165fc

View file

@ -12,11 +12,6 @@ function oembed_replacecb($matches){
function oembed_fetch_url($embedurl){ function oembed_fetch_url($embedurl){
if(! strpos('://',$embedurl)) {
// this may be wrong but it's already wrong, we can only guess
$embedurl = 'http://' . $embedurl;
}
$txt = Cache::get($embedurl); $txt = Cache::get($embedurl);
$noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm"); $noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm");