diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-16 02:09:29 +0200 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-16 02:09:29 +0200 |
| commit | ae3c9b7b2b6f6b8bf7a5d5e72bd66f1bff3b081d (patch) | |
| tree | 127e5f698b673ebe61b8221b796dae3a5e70a29e | |
| parent | dbf6ee6a0578a0b4244852b74dac549a25e6f05d (diff) | |
| parent | 7601ce7de747dcffdb63be027ed8b8327e0b6e41 (diff) | |
| download | volse-hubzilla-ae3c9b7b2b6f6b8bf7a5d5e72bd66f1bff3b081d.tar.gz volse-hubzilla-ae3c9b7b2b6f6b8bf7a5d5e72bd66f1bff3b081d.tar.bz2 volse-hubzilla-ae3c9b7b2b6f6b8bf7a5d5e72bd66f1bff3b081d.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
| -rw-r--r-- | include/bbcode.php | 1 | ||||
| -rw-r--r-- | include/html2bbcode.php | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index a44838c24..40f4935fb 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -97,6 +97,7 @@ function bbcode($Text,$preserve_nl = false) { $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text); + $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/", '<iframe src="$1" width="425" height="350"><a href="$1">$1</a></iframe>', $Text); // [img=widthxheight]image source[/img] $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/", '<img src="$3" style="height:{$2}px; width:{$1}px;" >', $Text); diff --git a/include/html2bbcode.php b/include/html2bbcode.php index 734282d95..d4e8cce66 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -35,6 +35,7 @@ function html2bbcode($s) { '/\<blockquote\>(.*?)\<\/blockquote\>/is', '/\<video(.*?) src=\"(.*?)\" (.*?)\>(.*?)\<\/video\>/is', '/\<audio(.*?) src=\"(.*?)\" (.*?)\>(.*?)\<\/audio\>/is', + '/\<iframe(.*?) src=\"(.*?)\" (.*?)\>(.*?)\<\/iframe\>/is', ); @@ -60,6 +61,7 @@ function html2bbcode($s) { '[quote]$1[/quote]', '[video]$1[/video]', '[audio]$1[/audio]', + '[iframe]$1[/iframe]', ); // Replace $htmltags in $text with $bbtags |