From a3ef1985ec016b4ceddc609e136d9187ada88b42 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 14 Mar 2013 16:30:55 +0000
Subject: [PATCH] switch to CKEditor4

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

diff --git a/phpgwapi/inc/class.egw_ckeditor_config.inc.php b/phpgwapi/inc/class.egw_ckeditor_config.inc.php
index 30c21e5c3c..658be15e23 100644
--- a/phpgwapi/inc/class.egw_ckeditor_config.inc.php
+++ b/phpgwapi/inc/class.egw_ckeditor_config.inc.php
@@ -18,7 +18,7 @@ class egw_ckeditor_config
 	private static $enterMode = null;
 	private static $skin = null;
 
-	// Defaults, defined in phpgwapi/js/ckeditor3/_source/plugins/font/plugin.js
+	// Defaults, defined in phpgwapi/js/ckeditor/plugins/font/plugin.js
 	public static $font_options = array(
 		'arial, helvetica, sans-serif' => 'Arial',
 		'Comic Sans MS, cursive' => 'Comic Sans MS',
@@ -120,7 +120,7 @@ class egw_ckeditor_config
 	private static function get_base_path()
 	{
 		//Get the ckeditor base url
-		return $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/ckeditor3/';
+		return $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/ckeditor/';
 	}
 
 	/**
diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index c8067e268a..d5e788f01c 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -531,7 +531,7 @@ class html
 		}
 
 		//include the ckeditor js file
-		egw_framework::validate_file('ckeditor3','ckeditor','phpgwapi');
+		egw_framework::validate_file('ckeditor','ckeditor','phpgwapi');
 
 		// run content through htmlpurifier
 		if ($_purify && !empty($_content))
@@ -556,7 +556,7 @@ class html
 		return self::textarea($_name,$_content,'id="'.htmlspecialchars($_name).'"',true).	// true = double encoding
 '
 <script type="text/javascript">
-	window.CKEDITOR_BASEPATH="'.$GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/ckeditor3/";
+	window.CKEDITOR_BASEPATH="'.$GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/ckeditor/";
 	CKEDITOR.replace("'.$_name.'", '.egw_ckeditor_config::get_ckeditor_config($_mode,
 		$pxheight, $expanded, $_start_path).');
 	CKEDITOR.instances["'.$_name.'"].on(