From 68c60ad574812c4f894ca8a397bd7cd6024f7078 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 10 Jun 2010 13:22:02 +0000
Subject: [PATCH] fixes to be able to start CKEditor without expanded toolbar

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

diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index f4584ed026..51c8e1827f 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -584,7 +584,7 @@ class html
 		}
 		// run content through htmlpurifier
 		if ($_purify && !empty($_content)) $_content = self::purify($_content);
-		$oCKeditor = self::initCKEditor($_height, $_mode);
+		$oCKeditor = self::initCKEditor($_height, $_mode, $_options);
 
 		/* Resize the editor to the actual size delivered by the $_height parameter once it is initialized */
 		$pxheight = (strpos('px', $_height) === false) ? (empty($_height)?400:$_height) : str_replace('px', '', $_height);
@@ -595,7 +595,7 @@ class html
 		return $oCKeditor->editor($_name, $_content, null, $events);
 	}
 
-	static function &initCKEditor($_height, $_mode)
+	static function &initCKEditor($_height, $_mode, $_options)
 	{
 		include_once(EGW_INCLUDE_ROOT."/phpgwapi/js/ckeditor3/ckeditor_php5.php");
 		// use the lang and country information to construct a possible lang info for CKEditor UI and scayt_slang