Commit e4d720b2 authored by sun's avatar sun

#304243 by sun: Code clean-up for wysiwyg_editor_user_status().

parent 11c19e9a
......@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 6.x-x.x, xxxx-xx-xx
---------------------------
#304243 by sun: Code clean-up for wysiwyg_editor_user_status().
#299108 by toniw: Added setting for TinyMCE's auto-cleanup paste feature.
#293916 by sun: Clarified TinyMCE compatibility in README.txt.
#293425 by sun: Fixed foreach warning during upgrade from TinyMCE module.
......
......@@ -600,8 +600,8 @@ function wysiwyg_editor_user_get_profile($account) {
function wysiwyg_editor_user_get_status($user, $profile) {
$settings = $profile->settings;
if ($settings['user_choose']) {
$status = isset($user->wysiwyg_editor_status) ? $user->wysiwyg_editor_status : (isset($settings['default']) ? $settings['default'] : FALSE);
if ($settings['user_choose'] && isset($user->wysiwyg_editor_status)) {
$status = $user->wysiwyg_editor_status;
}
else {
$status = isset($settings['default']) ? $settings['default'] : FALSE;
......
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