0.2.2, check changelog

heimrichhannot · Jul 3, 2018 · 348e4b7 · 348e4b7
1 parent 05d4992
commit 348e4b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [0.2.1] - 2018-03-22
+## [0.2.2] - 2018-07-03
+
+### Fixed
+* ensure that `$GLOBALS['TL_JAVASCRIPT']` is an array before `array_merge()` backend styles
+
+## [0.2.1] - 2018-07-03
 
 ### Fixed
 * correctly size modal window responsive

diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php
@@ -42,14 +42,14 @@
     if (!isset($GLOBALS['TL_JAVASCRIPT']['jquery'])) {
         $GLOBALS['TL_JAVASCRIPT'] = array_merge(
             ['jquery' => 'assets/jquery/js/jquery.min.js'],
-            $GLOBALS['TL_JAVASCRIPT']
+            is_array($GLOBALS['TL_JAVASCRIPT']) ? $GLOBALS['TL_JAVASCRIPT'] : []
         );
     }
     else {
         unset($GLOBALS['TL_JAVASCRIPT']['jquery']);
         $GLOBALS['TL_JAVASCRIPT'] = array_merge(
             ['jquery' => 'assets/jquery/js/jquery.min.js'],
-            $GLOBALS['TL_JAVASCRIPT']
+            is_array($GLOBALS['TL_JAVASCRIPT']) ? $GLOBALS['TL_JAVASCRIPT'] : []
         );
     }
     $GLOBALS['TL_JAVASCRIPT']['datatables-i18n']       = 'assets/datatables-additional/datatables-i18n/datatables-i18n.min.js|static';