dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

Browse Source
This commit is contained in:
djfm committed 2013-08-22 12:31:28 +00:00
2 parents 5faaef9f21 4de8013b5e
commit 47827a1a1b
12 files changed
+54 -39
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

controllers/admin/AdminCarrierWizardController.php
+1 -1
View File
@@ -718,7 +718,7 @@ class AdminCarrierWizardControllerCore extends AdminController
&& (!isset($logo['error']) || !$logo['error'])
&& preg_match('/\.(jpe?g|gif|png)$/', $logo['name'])
&& is_uploaded_file($logo['tmp_name'])
&& ImageManager::isRealImage($logo['tmp_name']))
&& ImageManager::isRealImage($logo['tmp_name'], $logo['type']))
{
$file = $logo['tmp_name'];
do $tmp_name = uniqid().'.jpg';