From 945f256e1b5a24462bd316ddff7727283904ad3b Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 22 Feb 2013 09:33:40 +0000
Subject: [PATCH] preset font span, omit empty style elements completely

---
 felamimail/inc/class.uicompose.inc.php | 2 +-
 phpgwapi/inc/class.html.inc.php        | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/felamimail/inc/class.uicompose.inc.php b/felamimail/inc/class.uicompose.inc.php
index 21c78a5d48..d9755de992 100644
--- a/felamimail/inc/class.uicompose.inc.php
+++ b/felamimail/inc/class.uicompose.inc.php
@@ -669,7 +669,7 @@
 				// User preferences for style
 				$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
 				$font_size = egw_ckeditor_config::font_size_from_prefs();
-				$font_span = '<span '.($font||$font_size?'style="':'').($font?'font-family:'.$font.'; ':'').';'.($font_size?'font-size:'.$font_size.'; ':'').'">'.'&nbsp;'.'</span>';
+				$font_span = '<span '.($font||$font_size?'style="':'').($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').'">'.'&nbsp;'.'</span>';
 				if (empty($font) && empty($font_size)) $font_span = '';
 			}
 			//remove possible html header stuff
diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index e0eb2ac9e7..31c1e86c98 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -526,6 +526,8 @@ class html
 		// User preferences
 		$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
 		$font_size = egw_ckeditor_config::font_size_from_prefs();
+		$font_span = '<span '.($font||$font_size?'style=\"':'').($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').'\">';
+		if (empty($font) && empty($font_size)) $font_span = '';
 
 		// we need to enable double encoding here, as ckEditor has to undo one level of encoding
 		// otherwise < and > chars eg. from html markup entered in regular (not source) input, will turn into html!
@@ -542,8 +544,8 @@ class html
 			ev.editor.resize("100%", '.str_replace('px', '', $pxheight).');
 		}
 	);'.
-	(trim($_content) == '' ? 'CKEDITOR.instances["'.$_name.'"].setData("<span style=\"font-family:'.$font.';font-size:'.$font_size.';\">&#8203;</span>");' : '').'
-</script>
+	(trim($_content) == '' && $font_span ? 'CKEDITOR.instances["'.$_name.'"].setData("'.$font_span.'&#8203;</span>");' : '').
+'</script>
 ';
 	}