Changeset 2897

Show
Ignore:
Timestamp:
08/07/08 23:19:36 (4 months ago)
Author:
bchoate
Message:

Delta for MT 4.12 release. js/common external pinned to revision 261; extlib/Data external pinned to revision 458.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/mt4.12

    • Property svn:externals changed from
      extlib/Data http://code.sixapart.com/svn/Data-ObjectDriver/trunk/lib/Data
       to
      extlib/Data -r458 http://code.sixapart.com/svn/Data-ObjectDriver/trunk/lib/Data

  • branches/mt4.12/build/mt-dists/default.mk

    r1361 r2897  
    11PRODUCT_NAME = Movable Type Core 
    22 
    3 PRODUCT_VERSION = 4.11 
     3PRODUCT_VERSION = 4.12 
    44SCHEMA_VERSION = 4.0036 
    5 API_VERSION = 4.11 
     5API_VERSION = 4.12 
    66 
    77# BUILD_LANGUAGE = en_US 

  • branches/mt4.12/lib/MT.pm.pre

    r1380 r2897  
    856856    } 
    857857 
    858     if ($cfg->ProcessMemoryCommand) { 
     858    if ($cfg->PerformanceLogging && $cfg->ProcessMemoryCommand) { 
    859859        $mt->log_times(); 
    860860    } 

  • branches/mt4.12/lib/MT/App/Search.pm

    r1283 r2897  
    292292    ## blog from the database. 
    293293    my($blog); 
    294     my $include = $app->param('IncludeBlogs'); 
     294    my $include = $app->param('IncludeBlogs') || ''; 
     295    $include =~ s/[^\d,]//g; 
    295296    if ($include) { 
    296297        my @blog_ids = split ',', $include; 
    …… 
    303304            $blog = MT::Blog->load($app->param('blog_id')); 
    304305        } 
    305         $include = $blog->id; 
    306     } 
     306        $include = $blog->id if $blog; 
     307    } 
     308    return $app->error($app->translate('Invalid request.')) 
     309        unless $blog; 
    307310 
    308311    ## Initialize and set up the context object. 
    …… 
    317320    } 
    318321    $ctx->stash('template_id', $app->{searchparam}{Template}); 
    319     $ctx->stash('maxresults', $app->{searchparam}{MaxResults}); 
     322    my $maxresults = $app->{searchparam}{MaxResults} || ''; 
     323    $maxresults =~ s/\D//g; 
     324    $app->{searchparam}{MaxResults} = $maxresults; 
     325    $ctx->stash('maxresults', $maxresults); 
    320326    $ctx->var( 'page_layout', $blog->page_layout ) 
    321327        if $blog && $blog->page_layout; 

  • branches/mt4.12/mt-static/js

    • Property svn:externals changed from
      common http://code.sixapart.com/svn/js/trunk/common
       to
      common -r261 http://code.sixapart.com/svn/js/trunk/common