Development

Changeset 8838

You must first sign up to be able to contribute.

Changeset 8838

Show
Ignore:
Timestamp:
05/07/08 18:53:50 (5 years ago)
Author:
nicolas
Message:

reverted r8831

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.0/lib/helper/ObjectAdminHelper.php

    r8831 r8838  
    4141    if ($include_remove = _get_option($options, 'include_remove')) 
    4242    { 
    43       $html .= checkbox_tag(strpos($name, ']') !== false ? substr($name, 0, -1).'_remove]' : $name).' '.($include_remove !== true ? __($include_remove) : __('remove file'))."\n"; 
     43      $html .= checkbox_tag(strpos($name, ']') !== false ? substr($name, 0, -1).'_remove]' : $name).' '.($include_remove != true ? __($include_remove) : __('remove file'))."\n"; 
    4444    } 
    4545  } 

  • branches/1.0/lib/validator/sfEmailValidator.class.php

    r8831 r8838  
    55 * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com> 
    66 * (c) 2004-2006 Sean Kerr <sean@code-box.org> 
    7  * 
     7 *  
    88 * For the full copyright and license information, please view the LICENSE 
    99 * file that was distributed with this source code. 
    …… 
    3535    if ($strict == true) 
    3636    { 
    37       $re = '/^([a-zA-Z0-9_\.\-\+])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/'; 
     37      $re = '/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i'; 
    3838    } 
    3939    else 

  • branches/1.0/test/unit/validator/sfEmailValidatorTest.php

    r8831 r8838  
    44 * This file is part of the symfony package. 
    55 * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com> 
    6  * 
     6 *  
    77 * For the full copyright and license information, please view the LICENSE 
    88 * file that was distributed with this source code. 
    …… 
    1212require_once($_test_dir.'/unit/sfContextMock.class.php'); 
    1313 
    14 $t = new lime_test(32, new lime_output_color()); 
     14$t = new lime_test(28, new lime_output_color()); 
    1515 
    1616$context = new sfContext(); 
    …… 
    3232  'example@localhost', 
    3333  'example@example.com@example.com', 
    34   '<script>alert("t");</script>@toto.fr', 
    3534); 
    3635 
    …… 
    4645  'example@', 
    4746  'example@example.com@example.com', 
    48   '<script>alert("t");</script>@toto.fr', 
    4947); 
    5048