Mods to script runned via CLI to permits to run also included

[friendica.git] / include / html2bbcode.php

diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index b993292300ad8fe0ab1f1ba9041268770811cad7..65cbcec41f66835acca21810cfe64200d43b87dd 100644 (file)
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -11,6 +11,9 @@ function html2bbcode($s) {
 
        $htmltags = array(
                '/\n/is',
+               '/\<pre\>(.*?)\<\/pre\>/is',
+               '/\<p(.*?)\>/is',
+               '/\<\/p\>/is',
                '/\<b\>(.*?)\<\/b\>/is',
                '/\<i\>(.*?)\<\/i\>/is',
                '/\<u\>(.*?)\<\/u\>/is',
@@ -24,8 +27,8 @@ function html2bbcode($s) {
                '/\<code\>(.*?)\<\/code\>/is',
                '/\<span style=\"color:(.*?)\"\>(.*?)\<\/span\>/is',
                '/\<blockquote\>(.*?)\<\/blockquote\>/is',
-               '/\<video(.*?) src=\"(.*?)\" (.*?)\>(.*?)</video>/is',
-               '/\<audio(.*?) src=\"(.*?)\" (.*?)\>(.*?)</audio>/is',
+               '/\<video(.*?) src=\"(.*?)\" (.*?)\>(.*?)\<\/video\>/is',
+               '/\<audio(.*?) src=\"(.*?)\" (.*?)\>(.*?)\<\/audio\>/is',
 
        );
 
@@ -33,6 +36,9 @@ function html2bbcode($s) {
 
        $bbtags = array(
                '',
+               '[code]$1[/code]',
+               '',
+               "\n",
                '[b]$1[/b]',
                '[i]$1[/i]',
                '[u]$1[/u]',