extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-09 23:11:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use preference for ckEditor features by default

Browse Source
This commit is contained in:
Nathan Gray 2012-12-05 19:58:37 +00:00
parent b67e2533b7
commit 85c15e42fd
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,8 +304,10 @@ class egw_ckeditor_config
/** /**
* @see get_ckeditor_config * @see get_ckeditor_config
*/ */
public static function get_ckeditor_config_array($mode = 'simple', $height = 400, $expanded_toolbar = true, $start_path = '') public static function get_ckeditor_config_array($mode = '', $height = 400, $expanded_toolbar = true, $start_path = '')
{ {
// If not explicitly set, use preference for toolbar mode
if(!$mode || trim($mode) == '') $mode = $GLOBALS['egw_info']['user']['preferences']['common']['rte_features'];
$config = array(); $config = array();
$spellchecker_button = null; $spellchecker_button = null;

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 : 'extended'), array('toolbar_expanded' =>'true'), '400px', '100%', $base_href); return self::fckEditor($name, $content, ($style ? $style : $GLOBALS['egw_info']['user']['preferences']['common']['rte_features']), array('toolbar_expanded' =>'true'), '400px', '100%', $base_href);
} }
/** /**