aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-01-29 22:44:38 +0100
committerMario Vavti <mario@mariovavti.com>2018-01-29 22:44:38 +0100
commit296117124c530ce7533431e6bb8a7958b89f7f51 (patch)
treef4cac99084f605059e830d4713926bf39fc13593 /include
parent0d21c6f86361d723175357b9584ca69d4a62e0a4 (diff)
parente4eff6a32bd6b9907c5c1a4454e5861f3712d380 (diff)
downloadvolse-hubzilla-296117124c530ce7533431e6bb8a7958b89f7f51.tar.gz
volse-hubzilla-296117124c530ce7533431e6bb8a7958b89f7f51.tar.bz2
volse-hubzilla-296117124c530ce7533431e6bb8a7958b89f7f51.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include')
-rw-r--r--include/bbcode.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 2b8274c0f..0c85a0a4e 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -108,7 +108,11 @@ function tryzrlvideo($match) {
if($zrl)
$link = zid($link);
- return '<video controls="controls" preload="none" src="' . str_replace(' ','%20',$link) . '" style="width:100%; max-width:' . App::$videowidth . 'px"><a href="' . str_replace(' ','%20',$link) . '">' . $link . '</a></video>';
+ $static_link = get_config('system','video_default_poster','images/video_poster.jpg');
+ if($static_link)
+ $poster = 'poster="' . escape_tags($static_link) . '" ' ;
+
+ return '<video ' . $poster . ' controls="controls" preload="none" src="' . str_replace(' ','%20',$link) . '" style="width:100%; max-width:' . App::$videowidth . 'px"><a href="' . str_replace(' ','%20',$link) . '">' . $link . '</a></video>';
}
// [noparse][i]italic[/i][/noparse] turns into