Show
Ignore:
Timestamp:
10/03/08 01:07:01 (14 months ago)
Author:
bchoate
Message:

Merging fireball branch changes to-date to trunk: svn merge -r2974:3081 http://code.sixapart.com/svn/movabletype/branches/fireball .

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/lib/MT/CMS/Common.pm

    r3039 r3082  
    961961        } 
    962962        elsif ( $type eq 'category' ) { 
    963             my @kids = MT::Category->load( { parent => $id } ); 
    964             return $app->errtrans( 
    965 "You can't delete that category because it has sub-categories. Move or delete the sub-categories first if you want to delete this one." 
    966             ) if @kids; 
    967963            if ( $app->config('DeleteFilesAtRebuild') ) { 
    968964                require MT::Blog;