Merge pull request #2853 from annando/1610-bugfix-config

[friendica.git] / include / bbcode.php

diff --git a/include/bbcode.php b/include/bbcode.php
index fd980a9b220387b645c858c1dd86fc4642f80e8b..ed23253648e615e5613893409d24a4865582891a 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -34,7 +34,6 @@ function bb_map_location($match) {
 function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
 
        $data = get_attachment_data($Text);
-
        if (!$data)
                return $Text;
 
@@ -85,7 +84,7 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
                                $text .= $oembed;
 
                        if (trim($data["description"]) != "")
-                               $text .= sprintf('<blockquote>%s</blockquote></span>', trim($data["description"]));
+                               $text .= sprintf('<blockquote>%s</blockquote></span>', trim(bbcode($data["description"])));
                }
        }
        return $data["text"].$text.$data["after"];
@@ -921,6 +920,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        $Text = preg_replace("(\[h5\](.*?)\[\/h5\])ism",'<h5>$1</h5>',$Text);
        $Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism",'<h6>$1</h6>',$Text);
 
+       // Check for paragraph
+       $Text = preg_replace("(\[p\](.*?)\[\/p\])ism",'<p>$1</p>',$Text);
+
        // Check for bold text
        $Text = preg_replace("(\[b\](.*?)\[\/b\])ism",'<strong>$1</strong>',$Text);
 
@@ -1140,6 +1142,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
                $Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/ism",'',$Text);
                $Text = preg_replace("/\[event\-location\](.*?)\[\/event\-location\]/ism",'',$Text);
                $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/ism",'',$Text);
+               $Text = preg_replace("/\[event\-id\](.*?)\[\/event\-id\]/ism",'',$Text);
        }