Changeset 3055

Show
Ignore:
Timestamp:
07/11/2008 08:18:25 AM (5 months ago)
Author:
Shadowhand
Message:

Moved ORM2 to ORM, updated i18n file, and set properties.

Location:
trunk/system
Files:
1 removed
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/system/i18n/en_US/orm.php

    r2612 r3055  
    11<?php defined('SYSPATH') or die('No direct script access.'); 
    22 
    3 $lang['method_not_implemented'] = 'The %s method is not implemented in the %s ORM model.'; 
     3$lang['query_methods_not_allowed'] = 'Query methods cannot be used through ORM'; 

  • trunk/system/libraries/ORM.php

    • Property svn:eol-style set to LF
    • Property copyright set to Copyright (c) 2007-2008 Kohana Team
    • Property svn:keywords set to Id
    r3054 r3055  
    77 * @see http://en.wikipedia.org/wiki/Object-relational_mapping 
    88 * 
    9  * $Id: ORM.php 2975 2008-07-07 00:20:45Z Shadowhand $ 
     9 * $Id$ 
    1010 * 
    1111 * @package    Core