diff options
author | redmatrix <mike@macgirvin.com> | 2016-09-29 19:26:58 -0700 |
---|---|---|
committer | redmatrix <mike@macgirvin.com> | 2016-09-29 19:26:58 -0700 |
commit | 2c1cd99738de75602466e022f454d4e135eb6412 (patch) | |
tree | 5b2ad13d53d58fc7345bbd5578457611cb0042f3 | |
parent | 07df5833becc2bc54823997c040997d56f0ae2cb (diff) | |
download | volse-hubzilla-2c1cd99738de75602466e022f454d4e135eb6412.tar.gz volse-hubzilla-2c1cd99738de75602466e022f454d4e135eb6412.tar.bz2 volse-hubzilla-2c1cd99738de75602466e022f454d4e135eb6412.zip |
issue #170
-rw-r--r-- | include/bbcode.php | 4 | ||||
-rwxr-xr-x | include/oembed.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 45dd5ef24..3e942f4a5 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -945,13 +945,13 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) $Text = preg_replace_callback("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mpeg|mpg))\[\/video\]/ism", 'tryzrlvideo', $Text); } if (strpos($Text,'[/audio]') !== false) { - $Text = preg_replace_callback("/\[audio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3|opus))\[\/audio\]/ism", 'tryzrlaudio', $Text); + $Text = preg_replace_callback("/\[audio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3|opus|m4a))\[\/audio\]/ism", 'tryzrlaudio', $Text); } if (strpos($Text,'[/zvideo]') !== false) { $Text = preg_replace_callback("/\[zvideo\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mpeg|mpg))\[\/zvideo\]/ism", 'tryzrlvideo', $Text); } if (strpos($Text,'[/zaudio]') !== false) { - $Text = preg_replace_callback("/\[zaudio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3|opus))\[\/zaudio\]/ism", 'tryzrlaudio', $Text); + $Text = preg_replace_callback("/\[zaudio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3|opus|m4a))\[\/zaudio\]/ism", 'tryzrlaudio', $Text); } // Try to Oembed diff --git a/include/oembed.php b/include/oembed.php index be2501229..1780e7046 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -117,7 +117,7 @@ function oembed_fetch_url($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",".opus"); + $noexts = [ '.mp3', '.mp4', '.ogg', '.ogv', '.oga', '.ogm', '.webm', '.opus', '.m4a' ]; $result = oembed_action($embedurl); |