Index: branches/5.2.x/core/units/helpers/fck_helper.php =================================================================== diff -u -N -r16513 -r16682 --- branches/5.2.x/core/units/helpers/fck_helper.php (.../fck_helper.php) (revision 16513) +++ branches/5.2.x/core/units/helpers/fck_helper.php (.../fck_helper.php) (revision 16682) @@ -1,6 +1,6 @@ Application->recallObject('theme.current'); $stylesheet_file = $theme->getStylesheetFile(true); - if ( $stylesheet_file ) { - $stylesheet_folder_url = dirname($stylesheet_file) . '/'; + if ( !isset($cache[$stylesheet_file]) ) { + if ( $stylesheet_file ) { + $stylesheet_folder_url = dirname($stylesheet_file) . '/'; - $url_params = Array ('events[fck]' => 'OnGetsEditorStyles', 'no_pass_through' => 1, 'pass' => 'm'); + $url_params = array('events[fck]' => 'OnGetsEditorStyles', 'no_pass_through' => 1, 'pass' => 'm'); - $prefix = $this->Application->isAdmin ? '_FRONT_END_' : ''; - $styles_css = $this->Application->HREF('index', $prefix, $url_params, 'index.php'); + $prefix = $this->Application->isAdmin ? '_FRONT_END_' : ''; + $styles_css = $this->Application->HREF('index', $prefix, $url_params, 'index.php'); - /** @var kCurlHelper $curl_helper */ - $curl_helper = $this->Application->recallObject('CurlHelper'); - $curl_helper->Send($styles_css, false); - $styles_css = $curl_helper->getInfo(CURLINFO_REDIRECT_URL); - $curl_helper->CloseConnection(); - } - else { - $stylesheet_folder_url = $this->Application->BaseURL(rtrim(EDITOR_PATH, '/')); - $styles_css = $stylesheet_folder_url . 'style.css'; - } + /** @var kCurlHelper $curl_helper */ + $curl_helper = $this->Application->recallObject('CurlHelper'); + $curl_helper->Send($styles_css, false); + $styles_css = $curl_helper->getInfo(CURLINFO_REDIRECT_URL); + $curl_helper->CloseConnection(); + } + else { + $stylesheet_folder_url = $this->Application->BaseURL(rtrim(EDITOR_PATH, '/')); + $styles_css = $stylesheet_folder_url . 'style.css'; + } - $styles_js = $stylesheet_folder_url . 'styles.js'; + $styles_js = $stylesheet_folder_url . 'styles.js'; - return array($styles_css, $styles_js); + $cache[$stylesheet_file] = array($styles_css, $styles_js); + } + + return $cache[$stylesheet_file]; } /**