aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-30 22:46:31 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-10-30 22:46:31 -0700
commit7a87343c7139c83de9baed8620a846ec45c36e2b (patch)
treebfcc1b20dbf6453912f6e9f0c25e230ee0d66ede
parent5f801216373078817d39b8aea34dd5fa7949dc6a (diff)
parente0463f5a74ac56f19dd1159cb4ce2d3eff52dc90 (diff)
downloadvolse-hubzilla-7a87343c7139c83de9baed8620a846ec45c36e2b.tar.gz
volse-hubzilla-7a87343c7139c83de9baed8620a846ec45c36e2b.tar.bz2
volse-hubzilla-7a87343c7139c83de9baed8620a846ec45c36e2b.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
-rw-r--r--include/bbcode.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 1092c08a3..517f22bee 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -28,7 +28,7 @@ function tryzrlaudio($match) {
if($zrl)
$link = zid($link);
- return '<audio src="' . str_replace(' ','%20',$link) . '" controls="controls"><a href="' . str_replace(' ','%20',$link) . '">' . $link . '</a></audio>';
+ return '<audio src="' . str_replace(' ','%20',$link) . '" controls="controls" preload="none"><a href="' . str_replace(' ','%20',$link) . '">' . $link . '</a></audio>';
}
function tryzrlvideo($match) {
@@ -37,7 +37,7 @@ function tryzrlvideo($match) {
if($zrl)
$link = zid($link);
- return '<video controls="controls" src="' . str_replace(' ','%20',$link) . '" style="width:100%; max-width:' . get_app()->videowidth . 'px"><a href="' . str_replace(' ','%20',$link) . '">' . $link . '</a></video>';
+ return '<video controls="controls" preload="none" src="' . str_replace(' ','%20',$link) . '" style="width:100%; max-width:' . get_app()->videowidth . 'px"><a href="' . str_replace(' ','%20',$link) . '">' . $link . '</a></video>';
}
// [noparse][i]italic[/i][/noparse] turns into