Changeset 4480 for trunk

Show
Ignore:
Timestamp:
09/30/09 06:56:19 (8 weeks ago)
Author:
fumiakiy
Message:

Merged Dunlop to trunk. "svn merge -r4391:4465 http://code.sixapart.com/svn/movabletype/branches/dunlop ."

Location:
trunk
Files:
4 modified
12 copied

Legend:

Unmodified
Added
Removed

  • trunk/lib/MT/Meta/Proxy.pm

    r4156 r4480  
    7575 
    7676        my $field = $proxy->META_CLASS()->metadata_by_name($pkg, $col) 
    77             or Carp::croak("Metadata $col on $pkg not found."); 
     77            or return undef; # XXX: Carp::croak("Metadata $col on $pkg not found."); 
    7878        my $type = $field->{type} 
    7979            or Carp::croak("$col not found on $pkg meta fields"); 
    … …  
    144144 
    145145    my $field = $proxy->META_CLASS()->metadata_by_name($pkg, $col) 
    146         or Carp::croak("there's no field $col on $pkg"); 
     146        or return; # XXX: Carp::croak("there's no field $col on $pkg"); 
    147147 
    148148    my $type_id = $field->{type_id} 
    … …  
    198198        my $pkg = $proxy->{pkg}; 
    199199        my $meta = $proxy->META_CLASS()->metadata_by_name($pkg, $field) 
    200             or Carp::croak("Metadata $field on $pkg not found."); 
     200            or next; # XXX: Carp::croak("Metadata $field on $pkg not found."); 
    201201        my $type = $meta->{type}; 
    202202 

  • trunk/lib/MT/Template/ContextHandlers.pm

    r4156 r4480  
    1502015020=head2 EntryIfCommentsOpen 
    1502115021 
    15022 Deprecated in favor of L<EntryIfCommentsActive>. 
     15022Deprecated in favor of L<IfCommentsActive>. 
    1502315023 
    1502415024=for tags deprecated 

  • trunk/mt-static/js/edit.js

    r3531 r4480  
    124124                    { 
    125125                        date: DOM.getElement( "created-on" ).value 
     126                        + 'T' 
     127                        + DOM.getElement( "entry_form" ).elements['authored_on_time'].value 
     128                        + 'Z' 
    126129                    }, 
    127130                    this.getIndirectMethod( "handleCreatedOnDate" ), 

  • trunk/php/lib/block.mtifarchivetypeenabled.php

    r4156 r4480  
    2222                foreach ($maps as $map) { 
    2323                    if ($map['templatemap_build_type']) 
    24                         $enabled++; 
     24                        $enabled = 1; /* was $enabled++; */ 
    2525                } 
    2626            }