Extend multi-line code blocks regular expression

- Covers the case where there's no new line after the [code] tag

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 714d780048b9724fe48f5570cd78ed6a433f65a7..daa8c5e0488cd5e6cff72136247c73a74de23b02 100644 (file)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -146,12 +146,16 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
 
        // Extracting multi-line code blocks before the whitespace processing/code highlighter in bbcode()
        $codeblocks = [];
-       $Text = preg_replace_callback('#\[code(?:=([^\]]*))?\](?=\n)(.*?)\[\/code\]#is',
+
+       $Text = preg_replace_callback("#\[code(?:=([^\]]*))?\](.*?)\[\/code\]#is",
                function ($matches) use (&$codeblocks) {
-                       $return = '#codeblock-' . count($codeblocks) . '#';
+                       $return = $matches[0];
+                       if (strpos($matches[2], "\n") !== false) {
+                               $return = '#codeblock-' . count($codeblocks) . '#';
 
-            $prefix = '````' . $matches[1] . PHP_EOL;
-                       $codeblocks[] = $prefix . trim($matches[2]) . PHP_EOL . '````';
+                               $prefix = '````' . $matches[1] . PHP_EOL;
+                               $codeblocks[] = $prefix . trim($matches[2]) . PHP_EOL . '````';
+                       }
                        return $return;
                }
        , $Text);