resolve merge conflict

2 files changed, 3 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index a967636d2..b5740cde5 100755
--- a/boot.php
+++ b/boot.php
@@ -44,7 +44,9 @@ require_once('include/account.php');
 
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
+
 define ( 'STD_VERSION',             '1.11' );
+
 define ( 'ZOT_REVISION',            '1.1' );
 
 define ( 'DB_UPDATE_VERSION',       1180  );
diff --git a/include/text.php b/include/text.php
index 0b4f039af..d4d151f2e 100644
--- a/include/text.php
+++ b/include/text.php
@@ -687,7 +687,7 @@ function get_tags($s) {
 
 	// ignore anything in a code block
 
-	$s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s);
+	$s = preg_replace('/\[code(.*?)\](.*?)\[\/code\]/sm','',$s);
 
 	// ignore anything in [style= ]
 	$s = preg_replace('/\[style=(.*?)\]/sm','',$s);