version 1.1.1.0

olegnax · Nov 3, 2020 · 325346f · 325346f
1 parent d245844
commit 325346f
Show file tree

Hide file tree

Showing 11 changed files with 856 additions and 26 deletions.
diff --git a/Block/Adminhtml/Modules/Update.php b/Block/Adminhtml/Modules/Update.php
@@ -84,10 +84,10 @@ public function getThemeVersions()
         ];
         $_themes = [];
         foreach ($themes as $themeName => $path) {
-            $theme = $this->helper->getThemeInfo($path, $themeName);
-            if (empty($theme)) {
-                continue;
-            }
+            $theme = $this->helper->getThemeInfo($path, $themeName, false);
+	        if (empty($theme)) {
+		        continue;
+	        }
             $_themes[$themeName] = $theme;
         }
 

diff --git a/Helper/Helper.php b/Helper/Helper.php
@@ -64,13 +64,15 @@ public function setModuleConfig(
     public function setSystemValue($path, $value, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeId = 0)
     {
         $result = $this->_loadObject(WriterInterface::class)->save($path, $value, $scope, $scopeId);
-        $this->_loadObject(ReinitableConfigInterface::class)->reinit();
+        $this->scopeConfig->clean();
         return $result;
     }
 
     public function deleteSystemValue($path, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeId = 0)
     {
-        return $this->_loadObject(WriterInterface::class)->delete($path, $scope, $scopeId);
+        $result = $this->_loadObject(WriterInterface::class)->delete($path, $scope, $scopeId);
+        $this->scopeConfig->clean();
+        return $result;
     }
 
     /**
@@ -130,7 +132,7 @@ public function isArea($area = Area::AREA_FRONTEND)
 
             try {
                 $this->isArea[$area] = ($state->getAreaCode() == $area);
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $this->isArea[$area] = false;
             }
         }