Commit 4248dc52 authored by sun's avatar sun

#304243 by sun: Fixed profile configuration improperly passed to JavaScript.

parent ecdf7b86
......@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 6.x-x.x, xxxx-xx-xx
---------------------------
#304243 by sun: Fixed profile configuration improperly passed to JavaScript.
#304243 by sun: Code clean-up for wysiwyg_editor_profile_overview().
#289218 by gustav: Fixed E^ALL notice if node has no body field.
#304243 by sun: Code clean-up for wysiwyg_editor_user_status().
......
This diff is collapsed.
......@@ -201,6 +201,7 @@ function wysiwyg_editor_load_config($theme) {
if (is_bool($value)) {
continue;
}
// Backwards compatibility for obsolete TinyMCE module.
switch ($value) {
case 'true':
$config[$key] = TRUE;
......@@ -255,11 +256,11 @@ function wysiwyg_editor_user($type, &$edit, &$user, $category = NULL) {
'#collapsed' => TRUE,
);
$form['wysiwyg']['wysiwyg_editor_status'] = array(
'#type' => 'select',
'#title' => t('Default state'),
'#type' => 'checkbox',
'#title' => t('Enable editor by default'),
'#default_value' => isset($user->wysiwyg_editor_status) ? $user->wysiwyg_editor_status : (isset($profile->settings['default']) ? $profile->settings['default'] : FALSE),
'#options' => array(FALSE => t('Disabled'), TRUE => t('Enabled')),
'#description' => t('Should rich-text editing be enabled or disabled by default in textarea fields?'),
'#return_value' => 1,
'#description' => t('If enabled, rich-text editing is enabled by default in textarea fields.'),
);
return array('wysiwyg_editor' => $form);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment