Merge remote-tracking branch 'origin/MAGETWO-66049' into MAGETWO-66039

rganin · rganin · commit 58135be1d21e · 2017-03-22T10:33:57.000+02:00
diff --git a/lib/internal/Magento/Framework/Url.php b/lib/internal/Magento/Framework/Url.php
@@ -856,7 +856,7 @@ function ($item) use (&$isCached) {
             ksort($cachedParams);
         }
 
-        $cacheKey = md5($routePath . json_encode($cachedParams));
+        $cacheKey = sha1($routePath . json_encode($cachedParams));
         if (!isset($this->cacheUrl[$cacheKey])) {
             $this->cacheUrl[$cacheKey] = $this->getUrlModifier()->execute(
                 $this->createUrl($routePath, $routeParams)

Original file line number	Diff line number	Diff line change
`@@ -856,7 +856,7 @@ function ($item) use (&$isCached) {`
`856`	`856`	`ksort($cachedParams);`
`857`	`857`	`}`
`858`	`858`
`859`		`- $cacheKey = md5($routePath . json_encode($cachedParams));`
	`859`	`+ $cacheKey = sha1($routePath . json_encode($cachedParams));`
`860`	`860`	`if (!isset($this->cacheUrl[$cacheKey])) {`
`861`	`861`	`$this->cacheUrl[$cacheKey] = $this->getUrlModifier()->execute(`
`862`	`862`	`$this->createUrl($routePath, $routeParams)`