Commit cd22694e authored by sun's avatar sun

#324366 by sun: Fixed "Illegal offset type" error on custom content-types.

parent 9e8e526a
......@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 6.x-x.x, xxxx-xx-xx
---------------------------
#324366 by sun: Fixed "Illegal offset type" error on custom content-types.
#328948 by sun: Fixed PHP notices when editors are assigned, but not configured.
#327710 by sun: Fixed nicEdit version could not be detected.
#328116 by sun: Added Safari plugin for TinyMCE 3.
......
......@@ -136,7 +136,7 @@ function wysiwyg_process_form(&$form) {
if ($profile) {
$editor = $profile->editor;
// Check editor theme (and reset it if not/no longer available).
$theme = wysiwyg_get_editor_themes($profile, $field['#wysiwyg_style']);
$theme = wysiwyg_get_editor_themes($profile, (isset($field['#wysiwyg_style']) ? $field['#wysiwyg_style'] : ''));
// Add profile settings for this input format.
wysiwyg_add_editor_settings($profile, $theme);
......
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