From d36beef91f42a3529e288a4abb5c560008afddf5 Mon Sep 17 00:00:00 2001
From: sgalinsk <sgalinsk@735d13b6-9817-0410-8766-e36946ffe9aa>
Date: Fri, 15 Jun 2012 18:26:00 +0000
Subject: [PATCH] [BUGFIX] Load always the normal configuration
git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/tinymce/trunk@63493 735d13b6-9817-0410-8766-e36946ffe9aa
---
class.tinymce.php | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/class.tinymce.php b/class.tinymce.php
index ba77593..d09e94d 100644
--- a/class.tinymce.php
+++ b/class.tinymce.php
@@ -120,11 +120,12 @@ class tinyMCE {
/**
* Returns a configuration string from the tinymce configuration array
*
+ * @param boolean $compressedConfiguration
* @return string
*/
- protected function buildConfigString() {
+ protected function buildConfigString($compressedConfiguration) {
$configuration = $this->tinymceConfiguration['preJS'];
- $configuration .= ($this->extensionConfiguration['compressed'] ? 'tinyMCE_GZ' : 'tinyMCE');
+ $configuration .= ($compressedConfiguration ? 'tinyMCE_GZ' : 'tinyMCE');
$configuration .= '.init({' . "\n";
$configurationOptions = array();
@@ -164,8 +165,11 @@ class tinyMCE {
$script = $GLOBALS['BACK_PATH'] . t3lib_extMgm::extRelPath('tinymce') . 'tinymce/' .
($this->extensionConfiguration['compressed'] ? 'tiny_mce_gzip.js' : 'tiny_mce.js');
- $output = '<script type="text/javascript" src="' . $script . '"></script>
- <script type="text/javascript">' . "\n" . $this->buildConfigString() . "\n" . '</script>';
+ $output = '<script type="text/javascript" src="' . $script . '"></script>';
+ if ($this->extensionConfiguration['compressed']) {
+ $output .= '<script type="text/javascript">' . "\n" . $this->buildConfigString(TRUE) . "\n" . '</script>';
+ }
+ $output .= '<script type="text/javascript">' . "\n" . $this->buildConfigString(FALSE) . "\n" . '</script>';
return $output;
}
--
GitLab