*************** *** 779,789 **** $settings['shiftEnterMode'] = constant("CKEDITOR_ENTERMODE_" . strtoupper($conf['shift_enter_mode'])); $settings['toolbarStartupExpanded'] = ( $conf['expand'] == 't' ); $settings['width'] = $conf['width']; - $settings['skin'] = $conf['skin']; $settings['format_tags'] = $conf['font_format']; //$settings['popup'] = $conf['popup']; $settings['show_toggle'] = $conf['show_toggle']; - if (isset($conf['language_direction'])) { switch ($conf['language_direction']) { --- 779,789 ---- $settings['shiftEnterMode'] = constant("CKEDITOR_ENTERMODE_" . strtoupper($conf['shift_enter_mode'])); $settings['toolbarStartupExpanded'] = ( $conf['expand'] == 't' ); $settings['width'] = $conf['width']; + $settings['skin'] = $conf['skin']; $settings['format_tags'] = $conf['font_format']; //$settings['popup'] = $conf['popup']; $settings['show_toggle'] = $conf['show_toggle']; + if (isset($conf['language_direction'])) { switch ($conf['language_direction']) { *************** *** 938,944 **** } } if (!empty($profile->settings['UserFilesAbsolutePath'])) { - $_SESSION['ckeditor'][$profile_name]['UserFilesAbsolutePath'] = strtr($profile->settings['UserFilesAbsolutePath'], array("%f" => variable_get('file_private_path', conf_path() . '/files'), "%u" => $user->uid, "%b" => base_path(), "%d" => $_SERVER['DOCUMENT_ROOT'], "%n" => $user->name)); } else { $private_dir = isset($global_profile->settings['private_dir']) ? trim($global_profile->settings['private_dir'], '\/') : ''; --- 938,950 ---- } } if (!empty($profile->settings['UserFilesAbsolutePath'])) { + if (base_path() != '/') + { + $_SESSION['ckeditor'][$profile_name]['UserFilesAbsolutePath'] = strtr($profile->settings['UserFilesAbsolutePath'], array("%f" => variable_get('file_private_path', conf_path() . '/files'), "%u" => $user->uid, "%b" => base_path(), "%d" => $_SERVER['DOCUMENT_ROOT'], "%n" => $user->name)); + }else + { + $_SESSION['ckeditor'][$profile_name]['UserFilesAbsolutePath'] = strtr($profile->settings['UserFilesAbsolutePath'], array("%f" => variable_get('file_private_path', conf_path() . '/files'), "%u" => $user->uid, "%b" => '', "%d" => $_SERVER['DOCUMENT_ROOT'], "%n" => $user->name)); + } } else { $private_dir = isset($global_profile->settings['private_dir']) ? trim($global_profile->settings['private_dir'], '\/') : '';