diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-12-21 17:37:35 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-12-21 17:37:35 +0100 |
| commit | 7f2070ca91aca9e92f3ac4c5b714742c6f9ecc3b (patch) | |
| tree | da414eee593cde8cdf631b598671daac22687380 /include | |
| parent | bf00e4dded7dd90443eafb8fc1c15b82ce723867 (diff) | |
| parent | 048fcae40b260b04e7b2e1774c1c72b69f790212 (diff) | |
| download | volse-hubzilla-7f2070ca91aca9e92f3ac4c5b714742c6f9ecc3b.tar.gz volse-hubzilla-7f2070ca91aca9e92f3ac4c5b714742c6f9ecc3b.tar.bz2 volse-hubzilla-7f2070ca91aca9e92f3ac4c5b714742c6f9ecc3b.zip | |
Merge remote-tracking branch 'friendica/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/bb2diaspora.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index eb709e01d..0e001df35 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -173,9 +173,9 @@ function bb2diaspora($Text,$preserve_nl = false) { // html5 video and audio -// $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '<video src="$1" controls="controls" width="425" height="350"><a href="$1">$1</a></video>', $Text); + $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '$1', $Text); -// $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text); + $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '$1', $Text); // $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/", '<iframe src="$1" width="425" height="350"><a href="$1">$1</a></iframe>', $Text); |