From 8d7ba936a1530338390500fd8b3c69e2d25694a3 Mon Sep 17 00:00:00 2001 From: "o.pinke" Date: Thu, 25 Jun 2020 15:31:00 +0200 Subject: [PATCH] bugfix url creation --- classes/class.modrewrite.php | 2 +- classes/class.modrewriteurlstack.php | 7 +++---- includes/functions.mod_rewrite.php | 5 ++++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/classes/class.modrewrite.php b/classes/class.modrewrite.php index fdab44a..971bc16 100644 --- a/classes/class.modrewrite.php +++ b/classes/class.modrewrite.php @@ -53,7 +53,7 @@ class ModRewrite extends ModRewriteBase { */ public static function initialize($clientId) { mr_loadConfiguration($clientId, true); - parent::initialize(); + parent::initialize($clientId); self::$_db = new DB_Contenido(); self::$_lookupTable = array(); } diff --git a/classes/class.modrewriteurlstack.php b/classes/class.modrewriteurlstack.php index f7cdc59..dbfd893 100644 --- a/classes/class.modrewriteurlstack.php +++ b/classes/class.modrewriteurlstack.php @@ -312,9 +312,8 @@ SQL; } } ModRewriteDebugger::add($aNewStack, 'ModRewriteUrlStack->_chunkSetPrettyUrlParts() $aNewStack'); - - // merge stack data + ModRewriteDebugger::add($this->_aStack, 'ModRewriteUrlStack->_chunkSetPrettyUrlParts() $this->_aStack'); + $this->_aStack = array_merge($this->_aStack, $aNewStack); } - -} +} \ No newline at end of file diff --git a/includes/functions.mod_rewrite.php b/includes/functions.mod_rewrite.php index d3fdcb0..42c645f 100644 --- a/includes/functions.mod_rewrite.php +++ b/includes/functions.mod_rewrite.php @@ -523,7 +523,10 @@ function mr_buildGeneratedCode($code) { $code = str_replace('"front_content.php"', '"' . mr_buildNewUrl('front_content.php') . '"', $code); $code = str_replace("'front_content.php'", "'" . mr_buildNewUrl('front_content.php') . "'", $code); $code = preg_replace_callback("/([\"|\'|=])front_content\.php(.?|.+?)([\"|\'|>])/i", function($match) { - return $match[1] . mr_buildNewUrl('front_content.php' . $match[2]) . $match[3]; + ModRewriteDebugger::add($match, 'mr_buildGeneratedCode() matches'); + $sHref = $match[1] . mr_buildNewUrl('front_content.php' . $match[2]) . $match[3]; + ModRewriteDebugger::add($sHref, 'mr_buildGeneratedCode() matches -> href'); + return $sHref; }, $code); ModRewriteDebugger::add($code, 'mr_buildGeneratedCode() out');