From f3d9602199a55c1f7d0694bb63c53dbbb259a828 Mon Sep 17 00:00:00 2001 From: lLefevre Date: Tue, 16 Oct 2012 09:52:07 +0000 Subject: [PATCH] [-] BO : fix #PSCFV-4053 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17870 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Validate.php | 2 +- controllers/admin/AdminFeaturesController.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/classes/Validate.php b/classes/Validate.php index 588ae22e5..61e0b403f 100644 --- a/classes/Validate.php +++ b/classes/Validate.php @@ -366,7 +366,7 @@ class ValidateCore */ public static function isGenericName($name) { - return empty($name) || preg_match('/^[^<>;=#{}]*$/u', $name); + return empty($name) || preg_match('/^[^<>=#{}]*$/u', $name); } /** diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php index cf672e45f..e486325ab 100644 --- a/controllers/admin/AdminFeaturesController.php +++ b/controllers/admin/AdminFeaturesController.php @@ -404,7 +404,9 @@ class AdminFeaturesControllerCore extends AdminController if (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && !count($this->errors)) $this->redirect_after = self::$currentIndex.'&'.$this->identifier.'=&conf=3&update'.$this->table.'&token='.$this->token; - + else if (Tools::isSubmit('submitAdd'.$this->table.'AndStay') && count($this->errors)) + $this->display = 'editFeatureValue'; + return $object; }