Merge remote-tracking branch 'friendika/master' into newui

[friendica.git] / include / html2bbcode.php

diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 734282d95c2f398ec0499777c12242508979b17c..d4e8cce6661cf84ebba4bac9ea9c819dba62c292 100644 (file)
--- 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