diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-07-02 18:36:39 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-07-02 18:36:39 +0100 |
| commit | d1cae2da2abc3a602f682114bc02cce08a7e7578 (patch) | |
| tree | ef3147f9db85bdde8e26303971a40d86e10bb508 /include/bbcode.php | |
| parent | 33696cc8392daeb08d011aa3b1209f3b121898ea (diff) | |
| parent | b86253c655f974920c4d3de0915611a7e66c7336 (diff) | |
| download | volse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.tar.gz volse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.tar.bz2 volse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/bbcode.php')
| -rw-r--r-- | include/bbcode.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 4f99a8038..862570348 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -424,11 +424,14 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $Text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", 'tryoembed', $Text); $Text = preg_replace_callback("/\[audio\](.*?)\[\/audio\]/ism", 'tryoembed', $Text); - } else { - $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '$1', $Text); - $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '$1', $Text); } + // if video couldn't be embedded, link to it instead. + + $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '<a href="$1">$1</a>', $Text); + $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '<a href="$1">$1</a>', $Text); + + // html5 video and audio |