Changeset 2966

Show
Ignore:
Timestamp:
08/22/08 01:30:07 (3 months ago)
Author:
auno
Message:

Merge from mt4.21

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/MANIFEST.SKIP

    r2923 r2966  
    5353#?package=MTOS ^plugins/feeds-app-lite 
    5454#?package=MTOS ^plugins/CustomFields 
     55 
     56#?package=MTCOM ^COPYING 
     57#?package=MTCOM ^COPYRIGHT 
     58#?package=MTCOM ^addons/Enterprise.pack 
     59#?package=MTCOM ^mt-static/addons/Enterprise.pack 
     60#?package=MTCOM ^addons/Community.pack 
     61#?package=MTCOM ^mt-static/addons/Community.pack 
     62#?package=MTCOM ^mt-cp.cgi 
     63#?package=MTCOM ^mt-static/themes/tristan-blue 
     64#?package=MTCOM ^mt-static/themes/tristan-blue-4.2 
    5565 
    5666#?package=MTE ^COPYING 
  • trunk/build/mt-dists/default.mk

    r2677 r2966  
    11PRODUCT_NAME = Movable Type Core 
    22 
    3 PRODUCT_VERSION = 4.2 
     3PRODUCT_VERSION = 4.21 
    44SCHEMA_VERSION = 4.0067 
    5 API_VERSION = 4.2 
     5API_VERSION = 4.21 
    66 
    77# BUILD_LANGUAGE = en_US 
  • trunk/lib/MT/TemplateMap.pm

    r2396 r2966  
    102102        if ( $_[0] && $_[0]->{template_id} ) { 
    103103            my $tmpl = MT::Template->load( $_[0]->{template_id} ); 
    104             $blog_id = $tmpl->blog_id if $tmpl; 
     104            if ( $tmpl ) { 
     105                return $result unless $tmpl->blog_id; # global template does not have maps 
     106                $blog_id = $tmpl->blog_id; 
     107            } 
    105108        } 
    106109 
  • trunk/lib/MT/Upgrade/v4.pm

    r2941 r2966  
    12471247    $sth->finish; 
    12481248 
    1249     # now, clear the meta column for each of the objects touched 
    1250     if (@ids) { 
    1251         my $id_col = $dbd->db_column_name($class->datasource, 'id'); 
    1252         my $list = join ",", @ids; 
    1253         my $sql = join " ", "UPDATE", $driver->table_for($class), 
    1254             "SET", $db_meta_col, "=NULL WHERE", $id_col, " IN ($list)"; 
    1255         $dbh->do($sql); 
    1256     } 
    1257  
    12581249    if ($rows == 101) { 
    12591250        $offset += 100;