This commit is contained in:
Rémi Gaillard committed 2013-08-27 15:41:00 +02:00
1 parent 17618efb8b
commit 30a914b148
1 file changed
+3 -3
@@ -104,7 +104,8 @@ class AdminLanguagesControllerCore extends AdminController
$this->addRowAction('delete'); $this->addRowAction('delete');
$this->displayWarning($this->l('When you delete a language, all related translations in the database will be deleted.')); $this->displayWarning($this->l('When you delete a language, all related translations in the database will be deleted.'));
$this->displayInformation($this->l('Your .htaccess file must be writable.')); if (!is_writable(_PS_ROOT_DIR_.'/.htaccess') && Configuration::get('PS_REWRITING_SETTINGS'))
$this->displayInformation($this->l('Your .htaccess file must be writable.'));
return parent::renderList(); return parent::renderList();
} }
@@ -374,12 +375,11 @@ class AdminLanguagesControllerCore extends AdminController
if ($_FILES['no-picture']['error'] == UPLOAD_ERR_OK) if ($_FILES['no-picture']['error'] == UPLOAD_ERR_OK)
$this->copyNoPictureImage(strtolower(Tools::getValue('iso_code'))); $this->copyNoPictureImage(strtolower(Tools::getValue('iso_code')));
unset($_FILES['no-picture']); unset($_FILES['no-picture']);
return parent::processAdd();
} }
else else
$this->errors[] = Tools::displayError('Flag and "No picture" image fields are required.'); $this->errors[] = Tools::displayError('Flag and "No picture" image fields are required.');
return false; return parent::processAdd();
} }
public function processUpdate() public function processUpdate()