Changeset 1450

Show
Ignore:
Timestamp:
12/07/07 15:04:42 (9 months ago)
Author:
Shadowhand
Message:

Removed Form_Address and Form_Citystatezip. They are more trouble than they are worth, and the input format is not consistent.

Location:
trunk/modules/forge
Files:
2 removed
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/modules/forge/helpers/locale_US.php

    r1438 r1450  
    22 
    33class locale_US { 
    4  
    5     public function months() 
    6     { 
    7         return array(); 
    8     } 
    94 
    105    public function states() 

  • trunk/modules/forge/i18n/en_US/forge.php

    r1447 r1450  
    33$lang = array 
    44( 
    5     'address_unit' => 'Unit' 
     5    'address_unit' => 'Unit #', 
     6    'address_city' => 'City', 
     7    'address_state' => 'State', 
     8    'address_zip' => 'Zip' 
    69); 

  • trunk/modules/forge/libraries/Form_Input.php

    r1448 r1450  
    193193                $args = is_array($args) ? $args : array(); 
    194194 
    195                 array_unshift($args, $this->label 
    196                     ? strtolower($this->label) 
    197                     : $this->name); 
     195                // Add the label or name to the beginning of the args 
     196                array_unshift($args, $this->label ? strtolower($this->label) : $this->name); 
    198197 
    199198                // Fetch an i18n error message 
    … …  
    260259                    $func = substr($rule, 6); 
    261260 
    262                     if ( ! valid::$func($this->value)) 
     261                    if ($this->value AND ! valid::$func($this->value)) 
    263262                    { 
    264263                        $this->errors[$rule] = TRUE;