[FIX] Refactor executeParser().

evolution-cms · Sep 20, 2023 · 1e472b3 · 1e472b3
1 parent c48d359
commit 1e472b3
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/core/src/Core.php b/core/src/Core.php
@@ -2723,7 +2723,6 @@ public function executeParser()
         if (is_cli()) {
             throw new \RuntimeException('Call DocumentParser::executeParser on CLI mode');
         }
-        //error_reporting(0);
 
         $this->_IIS_furl_fix(); // IIS friendly url fix
 
@@ -2753,7 +2752,6 @@ public function executeParser()
         if ($this->documentMethod !== 'alias') {
             $DLTemplate = \DLTemplate::getInstance(EvolutionCMS());
             $DLTemplate->setTemplatePath('views/');
-            //$this->_fixURI();
             // invoke OnWebPageInit event
             $this->invokeEvent("OnWebPageInit");
             // invoke OnLogPageView event
@@ -2767,11 +2765,10 @@ public function executeParser()
             return;
         }
 
-        $this->documentIdentifier = $this->cleanDocumentIdentifier($this->documentIdentifier);
+        $this->documentIdentifier = UrlProcessor::cleanDocumentIdentifier($this->documentIdentifier, $this->documentMethod);
 
         // Check use_alias_path and check if $this->virtualDir is set to anything, then parse the path
         if ($this->getConfig('use_alias_path') == 1) {
-
             $virtualDir = UrlProcessor::getFacadeRoot()->virtualDir;
             $alias = ($virtualDir != '' ? $virtualDir . '/' : '') . $this->documentIdentifier;
             if (isset(UrlProcessor::getFacadeRoot()->documentListing[$alias])) {
@@ -2810,7 +2807,6 @@ public function executeParser()
         $DLTemplate = \DLTemplate::getInstance(EvolutionCMS());
         $DLTemplate->setTemplatePath('views/');
 
-        //$this->_fixURI();
         // invoke OnWebPageInit event
         $this->invokeEvent('OnWebPageInit');
         // invoke OnLogPageView event