Changeset 2700

Show
Ignore:
Timestamp:
05/28/2008 04:45:52 PM (6 months ago)
Author:
Shadowhand
Message:

Merged r2699 into 2.1.2

Location:
releases/2.1.2/modules/forge
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • releases/2.1.2/modules/forge/i18n/en_US/forge.php

    r1923 r2700  
    33$lang = array 
    44( 
    5         'invalid_input' => 'Invalid input type requested: %s', 
     5        'invalid_input' => 'Error loading %s: All inputs must be constructed with a name', 
     6        'unknown_input' => 'Unable to find a Forge input class for: %s', 
    67); 

  • releases/2.1.2/modules/forge/libraries/Forge.php

    r2461 r2700  
    9090                switch(count($args)) 
    9191                { 
     92                        case 0: 
     93                                throw new Kohana_Exception('forge.invalid_input', $input); 
     94                        break; 
    9295                        case 1: 
    9396                                $input = new $input($args[0]);