tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-22 12:39:36 +02:00
Code Issues Projects Releases Wiki Activity

BUG Load just one of each plugin.

Browse Source
This commit is contained in:
Mateusz Uzdowski 2014-04-16 14:40:48 +12:00
parent 3620d01998
commit bde16f0eb6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
thirdparty/tinymce/tiny_mce_gzip.php vendored
View File

@ -94,17 +94,17 @@ class TinyMCE_Compressor {
$plugins = self::getParam("plugins"); $plugins = self::getParam("plugins");
if ($plugins) if ($plugins)
$this->settings["plugins"] = $plugins; $this->settings["plugins"] = $plugins;
$plugins = explode(',', $this->settings["plugins"]); $plugins = array_unique(explode(',', $this->settings["plugins"]));
$themes = self::getParam("themes"); $themes = self::getParam("themes");
if ($themes) if ($themes)
$this->settings["themes"] = $themes; $this->settings["themes"] = $themes;
$themes = explode(',', $this->settings["themes"]); $themes = array_unique(explode(',', $this->settings["themes"]));
$languages = self::getParam("languages"); $languages = self::getParam("languages");
if ($languages) if ($languages)
$this->settings["languages"] = $languages; $this->settings["languages"] = $languages;
$languages = explode(',', $this->settings["languages"]); $languages = array_unique(explode(',', $this->settings["languages"]));
$tagFiles = self::getParam("files"); $tagFiles = self::getParam("files");
if ($tagFiles) if ($tagFiles)
@ -140,7 +140,7 @@ class TinyMCE_Compressor {
} }
// Add any specified files. // Add any specified files.
$allFiles = array_merge($files, explode(',', $this->settings['files'])); $allFiles = array_merge($files, array_unique(explode(',', $this->settings['files'])));
// Process source files // Process source files
for ($i = 0; $i < count($allFiles); $i++) { for ($i = 0; $i < count($allFiles); $i++) {