holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes to be able to start CKEditor without expanded toolbar

Browse Source
This commit is contained in:
Ralf Becker 2010-06-10 13:21:23 +00:00
parent 0b417cf339
commit 22dcb1c5de
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpgwapi/inc/class.html.inc.php
View File

@ -584,7 +584,7 @@ class html
} }
// run content through htmlpurifier // run content through htmlpurifier
if ($_purify && !empty($_content)) $_content = self::purify($_content); 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 */ /* 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); $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); 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"); 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 // use the lang and country information to construct a possible lang info for CKEditor UI and scayt_slang