Merge branch 'MAGETWO-44274' into 'master3'

nikshostko · nikshostko · commit c4fb3ac5900a · 2015-10-26T12:51:06.000+03:00
Fix bug: Couldn't retrive a remote preview image file.

See merge request !150
diff --git a/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php b/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php
@@ -132,7 +132,9 @@ protected function retrieveRemoteImage($fileUrl, $localFilePath)
         $this->curl->write('GET', $fileUrl);
         $image = $this->curl->read();
         if (empty($image)) {
-            throw new \InvalidArgumentException(__('Couldn\'t retrive a remote preview image file. Service is inaccessible.'));
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('Could not get video information. Please check your connection and try again.')
+            );
         }
         $this->fileUtility->saveFile($localFilePath, $image);
     }

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,9 @@ protected function retrieveRemoteImage($fileUrl, $localFilePath)`
`132`	`132`	`$this->curl->write('GET', $fileUrl);`
`133`	`133`	`$image = $this->curl->read();`
`134`	`134`	`if (empty($image)) {`
`135`		`- throw new \InvalidArgumentException(__('Couldn\'t retrive a remote preview image file. Service is inaccessible.'));`
	`135`	`+ throw new \Magento\Framework\Exception\LocalizedException(`
	`136`	`+ __('Could not get video information. Please check your connection and try again.')`
	`137`	`+ );`
`136`	`138`	`}`
`137`	`139`	`$this->fileUtility->saveFile($localFilePath, $image);`
`138`	`140`	`}`