Merge branch '2017.12' into 2019.03

ezsystems · Dec 18, 2019 · b043ec4 · b043ec4
2 parents 625d836 + 5a39130
commit b043ec4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/ezutils/classes/ezuri.php b/lib/ezutils/classes/ezuri.php
@@ -605,7 +605,7 @@ public static function transformURI( &$href, $ignoreIndexDir = false, $serverURL
             $modifiedHref = eZClusterFileHandler::instance()->applyServerUri( $trimmedHref );
             if ( $modifiedHref != $trimmedHref )
             {
-                $href = $htmlEscape ? self::escapeHtmlTransformUri( $href ) : $href;
+                $href = $htmlEscape ? self::escapeHtmlTransformUri( $modifiedHref ) : $modifiedHref;
                 return true;
             }
             unset( $modifiedHref );