From a50810f9a61cacf7af29502c3f11406eca4b31f1 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 22 May 2014 10:01:31 +0000 Subject: [PATCH] if kama is choosen as skin, use monocolor; kama-skin seems not be fully compatible with ckeditor requirements on skins; next ckeditor update will remove kama skin --- phpgwapi/inc/class.egw_ckeditor_config.inc.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/phpgwapi/inc/class.egw_ckeditor_config.inc.php b/phpgwapi/inc/class.egw_ckeditor_config.inc.php index 69c1b92758..05bb1bb8d2 100644 --- a/phpgwapi/inc/class.egw_ckeditor_config.inc.php +++ b/phpgwapi/inc/class.egw_ckeditor_config.inc.php @@ -170,21 +170,18 @@ class egw_ckeditor_config //Convert old fckeditor skin names to new ones switch ($skin) { + case 'silver': + case 'office2003': case 'moono': $skin = "moono"; break; - case 'silver': - case 'office2003': case 'kama': case 'default': - $skin = "kama"; - // firefox and msie fail on kama skin - if (!(html::$user_agent == 'firefox' || html::$user_agent == 'msie')) break; case 'moonocolor': $skin = "moonocolor"; break; default: - $skin = "kama"; + $skin = "moonocolor"; } //Check whether the skin actually exists, if not, switch to a default