Merge remote-tracking branch 'tango_ce/MAGETWO-39126' into MAGETWO-39602

Bohdan Korablov · Bohdan Korablov · commit ad4efb137689 · 2015-07-06T18:09:25.000+03:00
diff --git a/lib/internal/Magento/Framework/Cache/Core.php b/lib/internal/Magento/Framework/Cache/Core.php
@@ -29,6 +29,7 @@ class Core extends \Zend_Cache_Core
     protected function _id($cacheId)
     {
         if ($cacheId !== null) {
+            $cacheId = str_replace('.', '__', $cacheId); //reduce collision chances
             $cacheId = preg_replace('/([^a-zA-Z0-9_]{1,1})/', '_', $cacheId);
             if (isset($this->_options['cache_id_prefix'])) {
                 $cacheId = $this->_options['cache_id_prefix'] . $cacheId;

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ class Core extends \Zend_Cache_Core`
`29`	`29`	`protected function _id($cacheId)`
`30`	`30`	`{`
`31`	`31`	`if ($cacheId !== null) {`
	`32`	`+ $cacheId = str_replace('.', '__', $cacheId); //reduce collision chances`
`32`	`33`	`$cacheId = preg_replace('/([^a-zA-Z0-9_]{1,1})/', '_', $cacheId);`
`33`	`34`	`if (isset($this->_options['cache_id_prefix'])) {`
`34`	`35`	`$cacheId = $this->_options['cache_id_prefix'] . $cacheId;`