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

Remove other places trying to set default ckEditor toolbar mode - using common preference

Browse Source
This commit is contained in:
Nathan Gray 2012-12-05 20:22:13 +00:00
parent 85c15e42fd
commit cbb88e22cb
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etemplate/inc/class.etemplate_old.inc.php
View File

@ -1339,7 +1339,6 @@ class etemplate_old extends boetemplate
} }
if (!$readonly) if (!$readonly)
{ {
$mode = $mode ? $mode : 'simple';
$height = $height ? $height : '400px'; $height = $height ? $height : '400px';
$width = $width ? $width : '100%'; $width = $width ? $width : '100%';
$fckoptions = array( $fckoptions = array(

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

@ -326,7 +326,7 @@ class egw_ckeditor_config
* @param boolean $expanded_toolbar specifies whether the ckeditor should start with an expanded toolbar or not * @param boolean $expanded_toolbar specifies whether the ckeditor should start with an expanded toolbar or not
* @param string $start_path specifies * @param string $start_path specifies
*/ */
public static function get_ckeditor_config($mode = 'simple', $height = 400, $expanded_toolbar = true, $start_path = '') public static function get_ckeditor_config($mode = '', $height = 400, $expanded_toolbar = true, $start_path = '')
{ {
return json_encode(self::get_ckeditor_config_array($mode, $height, $expanded_toolbar, $start_path)); return json_encode(self::get_ckeditor_config_array($mode, $height, $expanded_toolbar, $start_path));
} }

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

@ -505,7 +505,7 @@ class html
{ {
return self::textarea($name,$content,'style="'.$style.'"'); return self::textarea($name,$content,'style="'.$style.'"');
}*/ }*/
return self::fckEditor($name, $content, ($style ? $style : $GLOBALS['egw_info']['user']['preferences']['common']['rte_features']), array('toolbar_expanded' =>'true'), '400px', '100%', $base_href); return self::fckEditor($name, $content, $style, array('toolbar_expanded' =>'true'), '400px', '100%', $base_href);
} }
/** /**