tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3039 from mateusz/plugins

Browse Source 
BUG Load just one of each plugin.
This commit is contained in:
Damian Mooyman 2014-04-16 15:05:15 +12:00
commit 0ccd9f5bb9
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");
if ($plugins)
$this->settings["plugins"] = $plugins;
$plugins = explode(',', $this->settings["plugins"]);
$plugins = array_unique(explode(',', $this->settings["plugins"]));
$themes = self::getParam("themes");
if ($themes)
$this->settings["themes"] = $themes;
$themes = explode(',', $this->settings["themes"]);
$themes = array_unique(explode(',', $this->settings["themes"]));
$languages = self::getParam("languages");
if ($languages)
$this->settings["languages"] = $languages;
$languages = explode(',', $this->settings["languages"]);
$languages = array_unique(explode(',', $this->settings["languages"]));
$tagFiles = self::getParam("files");
if ($tagFiles)
@ -140,7 +140,7 @@ class TinyMCE_Compressor {
}
// 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
for ($i = 0; $i < count($allFiles); $i++) {