Merge remote-tracking branch 'origin/MAGETWO-36933' into sprint-54-bf

Dooffy · Dooffy · commit cb1d5a3d5d34 · 2015-06-17T17:23:43.000+03:00
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Request.php b/app/code/Magento/MediaStorage/Model/File/Storage/Request.php
@@ -29,7 +29,9 @@ class Request
      */
     public function __construct($workingDir, HttpRequest $request = null)
     {
-        $request = $request ?: new HttpRequest();
+        $request = $request ?: new HttpRequest(
+            new \Magento\Framework\Stdlib\Cookie\PhpCookieReader()
+        );
         $this->_pathInfo = str_replace('..', '', ltrim($request->getPathInfo(), '/'));
         $this->_filePath = $workingDir . '/' . $this->_pathInfo;
     }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,9 @@ class Request`
`29`	`29`	`*/`
`30`	`30`	`public function __construct($workingDir, HttpRequest $request = null)`
`31`	`31`	`{`
`32`		`- $request = $request ?: new HttpRequest();`
	`32`	`+ $request = $request ?: new HttpRequest(`
	`33`	`+ new \Magento\Framework\Stdlib\Cookie\PhpCookieReader()`
	`34`	`+ );`
`33`	`35`	`$this->_pathInfo = str_replace('..', '', ltrim($request->getPathInfo(), '/'));`
`34`	`36`	`$this->_filePath = $workingDir . '/' . $this->_pathInfo;`
`35`	`37`	`}`