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

// Fix validation of emails preferences

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8685 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-21 12:55:57 +00:00
parent d0102a81b7
commit fd45c7bb4d
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminTab.php
+3 -4
View File
@@ -958,7 +958,7 @@ abstract class AdminTabCore
if (!Tools::getValue($field) AND isset($values['default']))
$_POST[$field] = $values['default'];
if (!sizeof($this->_errors))
if (1||!sizeof($this->_errors))
{
foreach ($fields as $key => $options)
{
@@ -1024,8 +1024,7 @@ abstract class AdminTabCore
{
if (isset($field['validation']))
{
$validate = new Validate();
if (method_exists($validate, $field['validation']))
if ((!isset($field['empty']) || !$field['empty'] || (isset($field['empty']) && $field['empty'] && $value)) && method_exists('Validate', $field['validation']))
{
if (!Validate::$field['validation']($value))
{
@@ -1962,7 +1961,7 @@ abstract class AdminTabCore
public function displayOptionTypeRadio($key, $field, $value)
{
foreach ($field['choices'] as $k => $v)
echo '<input type="radio" name="'.$key.'" id="'.$key.$k.'_on" value="'.(int)$v.'"'.(($k == $value) ? ' checked="checked"' : '').(isset($field['js'][$k]) ? ' '.$field['js'][$k] : '').' /><label class="t" for="'.$key.$k.'_on"> '.$v.'</label><br />';
echo '<input type="radio" name="'.$key.'" id="'.$key.$k.'_on" value="'.(int)$k.'"'.(($k == $value) ? ' checked="checked"' : '').(isset($field['js'][$k]) ? ' '.$field['js'][$k] : '').' /><label class="t" for="'.$key.$k.'_on"> '.$v.'</label><br />';
echo '<br />';
}