X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fhtml2bbcode.php;h=28e251aee4e82425a0fd0c88574558c43f701dd7;hb=3bf789d0e340e824d40046ab6a6fd3eb968a7be7;hp=d2699460e31a43ace5fdcd60b8dd9f5c6d7b3d4c;hpb=dd21750d901c95a270543741ce1b7f7551300d4f;p=friendica.git

diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index d2699460e3..28e251aee4 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -85,17 +85,25 @@ function deletenode(&$doc, $node)
 		$child->parentNode->removeChild($child);
 }}
 
+function _replace_code_cb($m){
+	return "<code>".str_replace("\n","<br>\n",$m[1]). "</code>";
+}
+
 function html2bbcode($message)
 {
 
 	$message = str_replace("\r", "", $message);
 
+	$message = preg_replace_callback("|<pre><code>([^<]*)</code></pre>|ism", "_replace_code_cb", $message);
+
 	$message = str_replace(array(
 					"<li><p>",
-					"</p></li>"),
+					"</p></li>",
+				),
 				array(
 					"<li>",
-					"</li>"),
+					"</li>",
+				),
 				$message);
 
 	// remove namespaces
@@ -187,6 +195,7 @@ function html2bbcode($message)
 
 	node2bbcode($doc, 'span', array(), "", "");
 	node2bbcode($doc, 'pre', array(), "", "");
+
 	node2bbcode($doc, 'div', array(), "\r", "\r");
 	node2bbcode($doc, 'p', array(), "\n", "\n");
 
@@ -230,6 +239,7 @@ function html2bbcode($message)
 	node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]');
 
 	node2bbcode($doc, 'code', array(), '[code]', '[/code]');
+    node2bbcode($doc, 'key', array(), '[code]', '[/code]');
 
 	$message = $doc->saveHTML();