TinyMCE options were missing in textarea attribute (#1815)

isotope · Jul 26, 2017 · a936fdb · a936fdb
1 parent e19afc0
commit a936fdb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/system/modules/isotope/docs/CHANGELOG-2.4.md b/system/modules/isotope/docs/CHANGELOG-2.4.md
@@ -23,6 +23,7 @@ Version 2.4.2 (2017-??-??)
 - DC clipboard is stored in non-persistent session in Contao 4 (#1806)
 - Group and page selection in products backend did not reload (#1801)
 - Help wizard was empty for payment, shipping, gallery and producttype (#1821)
+- TinyMCE options were missing in textarea attribute (#1815)
 
 
 Version 2.4.1 (2017-03-07)

diff --git a/system/modules/isotope/library/Isotope/Backend/Attribute/Callback.php b/system/modules/isotope/library/Isotope/Backend/Attribute/Callback.php
@@ -134,15 +134,21 @@ public function getConditionFields($dc)
      */
     public function getRTE()
     {
-        $arrOptions = array();
+        $options = array();
 
-        foreach (scan(TL_ROOT . '/system/config') as $file) {
-            if (is_file(TL_ROOT . '/system/config/' . $file) && strpos($file, 'tiny') === 0) {
-                $arrOptions[] = basename($file, '.php');
+        if (version_compare(VERSION, '4.0', '<')) {
+            foreach (scan(TL_ROOT . '/system/config') as $file) {
+                if (is_file(TL_ROOT . '/system/config/' . $file) && strpos($file, 'tiny') === 0) {
+                    $options[] = basename($file, '.php');
+                }
+            }
+        } else {
+            foreach (preg_grep('/^be_tiny/', array_keys(\TemplateLoader::getFiles())) as $template) {
+                $options[] = substr($template, 3);
             }
         }
 
-        return $arrOptions;
+        return $options;
     }
 
     /**