Show
Ignore:
Timestamp:
10/13/08 21:56:13 (14 months ago)
Author:
bchoate
Message:

Merging latest changes from fireball to trunk: svn merge -r 3089:3095 http://code.sixapart.com/svn/movabletype/branches/fireball .

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/lib/MT/CMS/Entry.pm

    r3082 r3098  
    298298    my %entry_filters; 
    299299    if ( defined( my $filter = $q->param('convert_breaks') ) ) { 
    300         $entry_filters{$filter} = 1; 
     300        my @filters = split /\s*,\s*/, $filter; 
     301        $entry_filters{$_} = 1 for @filters; 
    301302    } 
    302303    elsif ($obj) { 
    … …  
    312313    $param->{text_filters} = []; 
    313314    for my $filter ( keys %$filters ) { 
     315        if (my $cond = $filters->{$filter}{condition}) { 
     316            $cond = MT->handler_to_coderef($cond) if !ref($cond); 
     317            next unless $cond->( $type ); 
     318        } 
    314319        push @{ $param->{text_filters} }, 
    315320          { 
    … …  
    342347 
    343348    my $rte; 
    344     if ($param->{convert_breaks} eq 'richtext') { 
     349    if ($param->{convert_breaks} =~ m/richtext/) { 
    345350        ## Rich Text editor 
    346351        $rte = lc($app->config('RichTextEditor'));