Support bbcode size tag - I may regret this...

4 files changed, 7 insertions, 5 deletions

diff --git a/boot.php b/boot.php
index 3edd45971..9d41abec4 100644
--- a/boot.php
+++ b/boot.php
@@ -305,9 +305,9 @@ class App {
 			$this->scheme = $parsed['scheme'];
 
 			$this->hostname = $parsed['host'];
-			if($parsed['port'])
+			if(x($parsed,'port'))
 				$this->hostname .= ':' . $parsed['port'];
-			if($parsed['path'])
+			if(x($parsed,'path'))
 				$this->path = trim($parsed['path'],'\\/');
 		}
 
diff --git a/include/bbcode.php b/include/bbcode.php
index eb0806dc5..f39ebd5b9 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -49,10 +49,10 @@ function bbcode($Text) {
 	$Text = preg_replace("(\[o\](.+?)\[\/o\])is",'<span class="overline">$1</span>',$Text);
 
 	// Check for colored text
-	$Text = preg_replace("(\[color=(.+?)\](.+?)\[\/color\])is","<span style=\"color: $1\">$2</span>",$Text);
+	$Text = preg_replace("(\[color=(.+?)\](.+?)\[\/color\])is","<span style=\"color: $1;\">$2</span>",$Text);
 
 	// Check for sized text
-	$Text = preg_replace("(\[size=(.+?)\](.+?)\[\/size\])is","<span style=\"font-size: $1px\">$2</span>",$Text);
+	$Text = preg_replace("(\[size=(.+?)\](.+?)\[\/size\])is","<span style=\"font-size: $1;\">$2</span>",$Text);
 
 	// Check for list text
 	$Text = preg_replace("/\[list\](.+?)\[\/list\]/is", '<ul class="listbullet">$1</ul>' ,$Text);
diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 6af8df824..bde761f2f 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -26,6 +26,7 @@ function html2bbcode($s) {
 		'/\<a (.*?)href=\"(.*?)\"(.*?)\>(.*?)\<\/a\>/is',
 		'/\<code\>(.*?)\<\/code\>/is',
 		'/\<span style=\"color:(.*?)\"\>(.*?)\<\/span\>/is',
+		'/\<span style=\"font-size:(.*?)\"\>(.*?)\<\/span\>/is',
 		'/\<blockquote\>(.*?)\<\/blockquote\>/is',
 		'/\<video(.*?) src=\"(.*?)\" (.*?)\>(.*?)\<\/video\>/is',
 		'/\<audio(.*?) src=\"(.*?)\" (.*?)\>(.*?)\<\/audio\>/is',
@@ -51,6 +52,7 @@ function html2bbcode($s) {
 		'[url=$2]$4[/url]',
 		'[code]$1[/code]',
 		'[color="$1"]$2[/color]',
+		'[size=$1]$2[/size]',
 		'[quote]$1[/quote]',
 		'[video]$1[/video]',
 		'[audio]$1[/audio]',
diff --git a/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
index ebccfb311..aad83280d 100644
--- a/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -103,7 +103,7 @@
 			rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,"<img width=\"$1\" height=\"$2\" src=\"$3\" />");

 			rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");

 			rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<span style=\"color: $1;\">$2</span>");

-//			rep(/\[\/code\]\s*\[code\]/gi,"<br />"); // fold multiline code

+			rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"<span style=\"font-size: $1;\">$2</span>");

 			rep(/\[code\](.*?)\[\/code\]/gi,"<code>$1</code>");

 			rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<blockquote>$1</blockquote>");