diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-11 01:24:59 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-11 01:24:59 -0500 |
| commit | dfdf0f13357d9e8a66d10da9e0f8506a010e2ab2 (patch) | |
| tree | 0431b729c1a7b75c27dda6d887e66e9d6b4a1de1 /include/bbcode.php | |
| parent | 665ad7e6600778c446aa9c5fc48ed32b309e64a7 (diff) | |
| parent | 5915325367013f96ffdabb7ef5ca56aa652ccd8d (diff) | |
| download | volse-hubzilla-dfdf0f13357d9e8a66d10da9e0f8506a010e2ab2.tar.gz volse-hubzilla-dfdf0f13357d9e8a66d10da9e0f8506a010e2ab2.tar.bz2 volse-hubzilla-dfdf0f13357d9e8a66d10da9e0f8506a010e2ab2.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
bug #328
default the text template var on conversations
bug #327 - composed private message is lost if no recip specified.
revup
fixed login-fields, fixed. notofication.png, changed locations
German translation
* master:
Diffstat (limited to 'include/bbcode.php')
| -rw-r--r-- | include/bbcode.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index cff26f5c8..d69cb263f 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -216,6 +216,9 @@ function bbcode($Text,$preserve_nl = false) { $Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text); + $Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '<video src="$1" controls="controls" width="425" height="350"><a href="$1">$1</a></video>', $Text); + + $Text = preg_replace("/\[audio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3))\[\/audio\]/ism", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text); // Try to Oembed $Text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", 'tryoembed', $Text); @@ -224,9 +227,6 @@ function bbcode($Text,$preserve_nl = false) { // html5 video and audio - $Text = preg_replace("/\[video\](.*?)\[\/video\]/ism", '<video src="$1" controls="controls" width="425" height="350"><a href="$1">$1</a></video>', $Text); - - $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/ism", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text); $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<iframe src="$1" width="425" height="350"><a href="$1">$1</a></iframe>', $Text); |