Merge pull request #1 from merzilla/feature/fix-first-install

FIX | add some array checks to prevent exceptions.
josefglatz · May 8, 2018 · b2a9afb · b2a9afb
2 parents 343e84e + c36f58a
commit b2a9afb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/Classes/Controller/IconcheckController.php b/Classes/Controller/IconcheckController.php
@@ -95,8 +95,10 @@ public function indexAction()
                         $iconsToShow[$string][] = $key;
                     }
                 }
-                // Sort icons
-                natcasesort($iconsToShow[$string]);
+                // Sort icons (only if it is an array)
+                if (is_array($iconsToShow[$string])) {
+                    natcasesort($iconsToShow[$string]);
+                }
             }
             $this->view->assign('iconsToShow', $iconsToShow);
         }

diff --git a/Classes/Domain/Model/Dto/ExtensionConfiguration.php b/Classes/Domain/Model/Dto/ExtensionConfiguration.php
@@ -21,11 +21,15 @@ class ExtensionConfiguration
 
     public function __construct()
     {
-        /** @noinspection UnserializeExploitsInspection */
-        $settings = (array)unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['iconcheck']);
-        foreach ($settings as $key => $value) {
-            if (property_exists(__CLASS__, $key)) {
-                $this->$key = $value;
+        if ($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['iconcheck'] === null) {
+            $settings = [];
+        } else {
+            /** @noinspection UnserializeExploitsInspection */
+            $settings = (array)unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['iconcheck']);
+            foreach ($settings as $key => $value) {
+                if (property_exists(__CLASS__, $key)) {
+                    $this->$key = $value;
+                }
             }
         }
     }