Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / include / oembed.php

diff --git a/include/oembed.php b/include/oembed.php
index 52068efc763fab6599e4d98b2168452c4815f9c6..cc71f9757c9208ffcdcd31ac5d8c4de38a53b24b 100755 (executable)
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -1,6 +1,6 @@
 <?php
 function oembed_replacecb($matches){
-       logger('oembedcb');
+//     logger('oembedcb');
        $embedurl=$matches[1];
        $j = oembed_fetch_url($embedurl);
        $s =  oembed_format_object($j);
@@ -14,6 +14,9 @@ function oembed_fetch_url($embedurl){
 
        $txt = Cache::get($embedurl);
 
+       // These media files should now be caught in bbcode.php
+       // left here as a fallback in case this is called from another source
+
        $noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm");
        $ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION);