Index: branches/5.3.x/core/units/helpers/fck_helper.php =================================================================== diff -u -N -r15999 -r16124 --- branches/5.3.x/core/units/helpers/fck_helper.php (.../fck_helper.php) (revision 15999) +++ branches/5.3.x/core/units/helpers/fck_helper.php (.../fck_helper.php) (revision 16124) @@ -1,6 +1,6 @@ Application->GetFrontThemePath(), '/') . '/inc'; + /** @var ThemeItem $theme */ + $theme = $this->Application->recallObject('theme.current'); + $stylesheet_file = $theme->getStylesheetFile(true); - if ( file_exists(FULL_PATH . '/' . $theme_path . '/style.css') ) { + if ( $stylesheet_file ) { + $stylesheet_folder_url = dirname($stylesheet_file) . '/'; + $url_params = Array ('events[fck]' => 'OnGetsEditorStyles', 'no_pass_through' => 1, 'pass' => 'm'); $styles_css = $this->Application->HREF('index', '_FRONT_END_', $url_params, 'index.php'); } else { - $theme_path = trim(EDITOR_PATH, '/'); - $styles_css = $this->Application->BaseURL() . $theme_path . '/style.css'; + $stylesheet_folder_url = $this->Application->BaseURL(rtrim(EDITOR_PATH, '/')); + $styles_css = $stylesheet_folder_url . 'style.css'; } - $styles_js = $this->Application->BaseURL() . $theme_path . '/styles.js'; + $styles_js = $stylesheet_folder_url . 'styles.js'; return array($styles_css, $styles_js); } @@ -618,4 +622,4 @@ return $ret; } -} \ No newline at end of file +}