Merge pull request #87 from OXIDprojects/fix-scanning-blocknames

fix #issues/84
OXIDprojects · Feb 27, 2019 · c5fedc9 · c5fedc9
2 parents 363b816 + da21d01
commit c5fedc9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Core/InternalModule.php b/Core/InternalModule.php
@@ -13,7 +13,7 @@
 use \OxidEsales\Eshop\Core\DatabaseProvider as DatabaseProvider;
 use \OxidEsales\Eshop\Core\Registry as Registry;
 use \OxidEsales\Eshop\Core\Module\ModuleList as ModuleList;
-use OxidEsales\Eshop\Core\Request;
+
 
 /**
  * Class InternalModule: chain extends OxidEsales\Eshop\Core\Module\Module
@@ -403,7 +403,7 @@ public function checkTemplateBlocks()
                 $aBlock['t_state'] = self::OK;
                 $aBlock['b_state'] = self::OK;
                 $sContent = file_get_contents($sTemplate);
-                if (!preg_match('/\[{.*block.* name.*= *"' . $block . '".*}\]/', $sContent)) {
+                if (!preg_match('/\[{\s*block[^}]+?name\s*=\s*["\']' . $block . '[\'"].*?}\]/', $sContent)) {
                     $aBlock['b_state'] = self::SHOP_FILE_NOT_FOUND;
                     $this->state |= self::MAY_NEED_MANUAL_FIX;
                 }