From 710feb595a560892a0ace8623f4110ad77be5859 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Tue, 15 Jan 2013 13:54:06 +0100 Subject: [PATCH] // Fixed typo --- .../controllers/translations/helpers/view/main.tpl | 2 +- controllers/admin/AdminModulesController.php | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl index 3afed9384..afd7856d3 100644 --- a/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl +++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl @@ -87,7 +87,7 @@ {l s='Add / Update a language'}
-

{l s='You can add or update a language directly from the PrestaShop webiste here:'}

+

{l s='You can add or update a language directly from the PrestaShop website here:'}

{l s='If you choose to update an existing language pack, all of your previous customization\'s in the theme named "Default" will be lost. This includes Front Office expressions and default email templates.'}
diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 67d51e46e..d1c3dfeb8 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -447,6 +447,13 @@ class AdminModulesControllerCore extends AdminController // Try to upload and unarchive the module if ($this->tabAccess['add'] === '1') { + // UPLOAD_ERR_OK: 0 + // UPLOAD_ERR_INI_SIZE: 1 + // UPLOAD_ERR_FORM_SIZE: 2 + // UPLOAD_ERR_NO_TMP_DIR: 6 + // UPLOAD_ERR_CANT_WRITE: 7 + // UPLOAD_ERR_EXTENSION: 8 + // UPLOAD_ERR_PARTIAL: 3 if (!isset($_FILES['file']['tmp_name']) || empty($_FILES['file']['tmp_name'])) $this->errors[] = $this->l('No file has been selected'); elseif (substr($_FILES['file']['name'], -4) != '.tar' && substr($_FILES['file']['name'], -4) != '.zip'