extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 16:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix ckeditor config to allow string with css unit, also added some docu

Browse Source
This commit is contained in:
Ralf Becker 2013-11-16 16:08:35 +00:00
parent d5788429c8
commit 65b3cee7ab
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpgwapi/inc/class.egw_ckeditor_config.inc.php
View File

@ -198,6 +198,8 @@ class egw_ckeditor_config
/** /**
* Returns the URL of the filebrowser * Returns the URL of the filebrowser
*
* @param string $start_path start path for file browser
*/ */
private static function get_filebrowserBrowseUrl($start_path = '') private static function get_filebrowserBrowseUrl($start_path = '')
{ {
@ -207,12 +209,17 @@ class egw_ckeditor_config
/** /**
* Adds all "easy to write" options to the configuration * Adds all "easy to write" options to the configuration
*
* @param array& $config array were config get's added to
* @param int|string $height integer height in pixel or string with css unit
* @param boolean|string $expanded_toolbar show toolbar expanded, boolean value, string "false", or string casted to boolean
* @param string $start_path start path for file browser
*/ */
private static function add_default_options(&$config, $height, $expanded_toolbar, $start_path) private static function add_default_options(&$config, $height, $expanded_toolbar, $start_path)
{ {
//Convert the pixel height to an integer value //Convert the pixel height to an integer value
$config['resize_enabled'] = false; $config['resize_enabled'] = false;
$config['height'] = (int)$height; $config['height'] = is_numeric($height) ? (int)$height : $height;
//disable encoding as entities needs to set the config value to false, as the default is true with the current ckeditor version //disable encoding as entities needs to set the config value to false, as the default is true with the current ckeditor version
$config['entities'] = false; $config['entities'] = false;
$config['entities_latin'] = false; $config['entities_latin'] = false;