Merge branch 'master-2.0.x' of github.com:bkraul/BBCodePlus into feat-2.0.x-newparser

Author: bkraul

BBCodePlus/BBCodePlus.php

@@ -22,7 +22,7 @@ function register() {
 			$this->name        = plugin_lang_get( 'title' );
 			$this->description = plugin_lang_get( 'description' );
 			$this->page        = 'config';
-			$this->version     = '2.0.17';
+			$this->version     = '2.0.18';
 
 			$this->requires['MantisCore'] = '2.0.0';
 			# this plugin can coexist with MantisCoreFormatting.
@@ -376,16 +376,16 @@ function string_process_bbcode( $p_string, $p_multiline = TRUE ) {
 			
 			# code=lang
 			$p_string = preg_replace_callback('/\[code=(\w+)\](.+)\[\/code\]/imsU',
-			create_function('$m', '
+			function ($m) {
 				return "<pre><code class=\"language-" . strtolower($m[1]) . "\">" . $m[2] . "</code></pre>";
-			')
+			}
 			, $p_string);
 			
 			# code=lang start=n
 			$p_string = preg_replace_callback('/\[code=(\w+)\ start=([0-9]+)\](.+)\[\/code\]/imsU',
-			create_function('$m', '
+			function ($m) {
 				return "<pre class=\"line-numbers\" data-start=\"" . $m[2] . "\"><code class=\"language-" . strtolower($m[1]) . "\">" . $m[3] . "</code></pre>";
-			')
+			}
 			, $p_string);
 			
 			# process quotes.	
@@ -498,16 +498,16 @@ function string_strip_bbcode( $p_string, $p_multiline = TRUE ) {
 
 			# code=lang
 			$p_string = preg_replace_callback('/\[code=(\w+)\](.+)\[\/code\]/imsU',
-			create_function('$m', '
+			function ($m) {
 				return $m[2];
-			')
+			}
 			, $p_string);
 
 			# code=lang start=n
 			$p_string = preg_replace_callback('/\[code=(\w+)\ start=([0-9]+)\](.+)\[\/code\]/imsU',
-			create_function('$m', '
+			function ($m) {
 				return $m[3];
-			')
+			}
 			, $p_string);
 
 			# process quotes.	
@@ -544,9 +544,9 @@ function restore_pre_code_tags( $p_string, $p_multiline = true ) {
 			$tags = implode( '|', $tags );
 
 			$t_string = preg_replace_callback('/&lt;(' . $tags . ')(.*?)&gt;/ui',
-			create_function('$m', '
+			function($m) {
 				return "<" . $m[1] . str_replace("&quot;", "\"", $m[2]) . ">";
-			')
+			}
 			, $t_string);
 
 			$t_string = preg_replace( '/&lt;\/(' . $tags . ')\s*&gt;/ui', '</\\1>', $t_string );			

README.md

@@ -1,17 +1,21 @@
 BBCodePlus
 =============
-BBCode plugin for Mantis BugTracker 2.0
+BBCode plugin for Mantis BugTracker 2.x
 
-* See [1.2.x branch](https://github.com/mantisbt-plugins/BBCodePlus/tree/master-1.2.x) for the Mantis 1.2 version.
-* See [BBCodePlus](https://github.com/mantisbt-plugins/BBCodePlus) for the Mantis 1.3 version.
+* See branch [master-1.2.x](https://github.com/mantisbt-plugins/BBCodePlus/tree/master-1.2.x) for the Mantis 1.2 version.
+* See [master](https://github.com/mantisbt-plugins/BBCodePlus) for the Mantis 1.3 version.
 
 Incorporates the following configurable features:
 
 * Editor with toolbars and preview (using [jQuery MarkItUp](http://markitup.jaysalvat.com/home/)).
 * BBCode processing.
 * Syntax Highlighting (using [prismjs](http://prismjs.com/)).
 
-Screenshots:
+## Contributing to BBCodePlus
+
+If you would like to contribute to BBCode plus, please [read this first](https://github.com/mantisbt-plugins/BBCodePlus/wiki/Contributing-to-BBCodePlus). 
+
+## Screenshots:
 
 ![Markup editor](https://raw.githubusercontent.com/mantisbt-plugins/BBCodePlus/master/Screen1.png)
 
@@ -53,4 +57,5 @@ Supported BBCode Tags
 [code start=3][/code] - Code block with line numbers starting at number.
 [quote][/quote] - Quote by *someone* (no name).
 [quote=name][/quote] - Quote by *name*.
-```
+```
+