From 98120c44b3e164b3d658e614e1c019f61181b8aa Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 22 Feb 2013 09:45:47 +0000
Subject: [PATCH] omit unit, when no size is given; display unit to the user,
 so he knows what he is selecting

---
 phpgwapi/inc/class.egw_ckeditor_config.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/inc/class.egw_ckeditor_config.inc.php b/phpgwapi/inc/class.egw_ckeditor_config.inc.php
index 5ee250e181..30c21e5c3c 100644
--- a/phpgwapi/inc/class.egw_ckeditor_config.inc.php
+++ b/phpgwapi/inc/class.egw_ckeditor_config.inc.php
@@ -72,7 +72,7 @@ class egw_ckeditor_config
 			$unit = 'px';
 			$size = (string)(int)$size;
 		}
-		return $size.$unit;
+		return $size.($size?$unit:'');
 	}
 
 	/**
@@ -228,7 +228,7 @@ class egw_ckeditor_config
 		if (empty($unit)) $unit = 'px';
 		foreach(self::$font_size_options as $k => $v)
 		{
-			$config['fontSize_sizes'] .= $v.'/'.$k.$unit.';';
+			$config['fontSize_sizes'] .= $v.$unit.'/'.$k.$unit.';';
 		}
 	}