improved code blocks

diff --git a/include/bbcode.php b/include/bbcode.php
index 7fc1eac1c449c6aa04d4ed7d8b6a090009ec6731..3619015ca9f8c6fa0734ff0af8c6f932c65f34b3 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -3,6 +3,13 @@
 require_once("include/oembed.php");
 require_once('include/event.php');
 
+
+
+function stripcode_br_cb($s) {
+       return '[code]' . str_replace('<br />', '', $s[1]) . '[/code]';
+}
+
+
        // BBcode 2 HTML was written by WAY2WEB.net
        // extended to work with Mistpark/Friendika - Mike Macgirvin
 
@@ -89,9 +96,16 @@ function bbcode($Text,$preserve_nl = false) {
        $Text = preg_replace("(\[font=(.*?)\](.*?)\[\/font\])","<span style=\"font-family: $1;\">$2</span>",$Text);
 
        // Declare the format for [code] layout
+
+       $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/is",'stripcode_br_cb',$Text);
+
        $CodeLayout = '<code>$1</code>';
        // Check for [code] text
        $Text = preg_replace("/\[code\](.*?)\[\/code\]/is","$CodeLayout", $Text);
+
+
+
+
        // Declare the format for [quote] layout
        $QuoteLayout = '<blockquote>$1</blockquote>';                     
        // Check for [quote] text

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 78a0bff5bedbe0a9cdec194adc056fe12a87ad8d..5ee3761ef1ff956984a9818cc689f24c3d81dce7 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -45,8 +45,8 @@ code {
        border: 1px solid #444;
        background: #EEE;
        color: #444;
-       padding: 10px;
-       margin-top: 20px;
+       padding: 0px 10px 10px 10px;
+       margin-top: 20px; 
 }
 /*blockquote:before {
        content: '>> ';