### Eclipse Workspace Patch 1.0 #P wysiwyg Index: editors/ckeditor.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/wysiwyg/editors/ckeditor.inc,v retrieving revision 1.2 diff -u -r1.2 ckeditor.inc --- editors/ckeditor.inc 10 Aug 2009 22:54:40 -0000 1.2 +++ editors/ckeditor.inc 8 Oct 2009 03:38:45 -0000 @@ -97,15 +97,15 @@ $settings = array( 'basePath' => base_path() . $editor['library path'] . '/', 'SkinPath' => base_path() . $editor['library path'] . '/editor/skins/' . $theme . '/', - 'Width' => '100%', - 'Height' => 420, + 'width' => '100%', + 'height' => 420, // By default, CKeditor converts most characters into HTML entities. Since // it does not support a custom definition, but Drupal supports Unicode, we // disable at least the additional character sets. CKeditor always converts // XML default characters '&', '<', '>'. // @todo Check whether completely disabling ProcessHTMLEntities is an option. - 'IncludeLatinEntities' => FALSE, - 'IncludeGreekEntities' => FALSE, + 'entities_greek' => false, + 'entities_latin' => false, ); if (isset($config['block_formats'])) { $settings['FontFormats'] = strtr($config['block_formats'], array(',' => ';')); @@ -151,6 +151,22 @@ $settings['toolbar'] = array($settings['toolbar']); } } + // Language + if (isset($config['language'])) { + $settings['language'] = $config['language']; + } + + // Resizing button + if (isset($config['resizing'])) { + $settings['resize_enabled'] = $config['resizing']; + } + + //Toolbar location + if (isset($config['toolbar_loc'])) { + $settings['toolbarLocation'] = $config['toolbar_loc']; + } + + return $settings; } @@ -168,9 +184,6 @@ if (empty($plugin['internal']) && isset($plugin['path'])) { $settings[$name]['path'] = base_path() . $plugin['path']; } - if (!empty($plugin['languages'])) { - $settings[$name]['languages'] = $plugin['languages']; - } } } return $settings;