Changeset 3022

Show
Ignore:
Timestamp:
07/09/2008 10:01:11 PM (5 months ago)
Author:
Shadowhand
Message:

Misc fixes:

  • Added core.invalid_property i18n string
  • ORM_Iterator now forces return values to be objects (doh!)
Location:
trunk/system
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • trunk/system/i18n/en_US/core.php

    r2753 r3022  
    66        'uncaught_exception'    => 'Uncaught %s: %s in file %s on line %s', 
    77        'invalid_method'        => 'Invalid method %s called in %s', 
     8        'invalid_property'      => 'The %s property does not exist in the %s class.', 
    89        'log_dir_unwritable'    => 'The log directory is not writable: %s', 
    910        'resource_not_found'    => 'The requested %s, %s, could not be found', 
  • trunk/system/libraries/ORM_Iterator.php

    r2604 r3022  
    2424 
    2525                // Database result 
    26                 $this->result = $result; 
     26                $this->result = $result->result(TRUE); 
    2727        } 
    2828