Changeset 2815

Show
Ignore:
Timestamp:
07/18/08 21:00:14 (1 month ago)
Author:
arvind
Message:

Made load_revision more like MT::Object->load, allows and or simply just

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/feature-revision-histories/lib/MT/Revisable.pm

    r2814 r2815  
    242242sub load_revision { 
    243243    my $obj = shift; 
    244     my ($rev_id) = @_; 
    245     my $datasource = $obj->datasource; 
    246      
     244    my ($terms, $args) = @_; 
     245    my $datasource = $obj->datasource;     
    247246    my $rev_class = MT->model($datasource . ':revision'); 
    248247     
    249     my $terms = { 
    250         $datasource . '_id' => $obj->id, 
    251         $rev_id ? ( id => $rev_id ) : () 
    252     }; 
    253     my $args; 
    254     if(!$rev_id && !wantarray) { 
    255         $args = { 
    256             sort => 'id', 
    257             direction => 'descend', 
    258             limit => 1 
    259         };  
    260     } 
     248    $args ||= {}; 
     249    # Only specified a revision_id 
     250    if(defined $terms && ref $terms ne 'HASH') {  
     251        $terms = { id => $_[0] };          
     252    }     
     253    $terms->{$datasource . '_id'} ||= $obj->id;     
    261254     
    262255    if ( wantarray ) {