Merge branch '2017.12' into 2019.03

André R · André R · commit b043ec49d2e2 · 2019-12-18T13:59:11.000+01:00
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 );

Original file line number	Diff line number	Diff line change
`@@ -605,7 +605,7 @@ public static function transformURI( &$href, $ignoreIndexDir = false, $serverURL`
`605`	`605`	`$modifiedHref = eZClusterFileHandler::instance()->applyServerUri( $trimmedHref );`
`606`	`606`	`if ( $modifiedHref != $trimmedHref )`
`607`	`607`	`{`
`608`		`- $href = $htmlEscape ? self::escapeHtmlTransformUri( $href ) : $href;`
	`608`	`+ $href = $htmlEscape ? self::escapeHtmlTransformUri( $modifiedHref ) : $modifiedHref;`
`609`	`609`	`return true;`
`610`	`610`	`}`
`611`	`611`	`unset( $modifiedHref );`