Changeset 956

Show
Ignore:
Timestamp:
12/19/06 23:21:06 (2 years ago)
Author:
gboggs
Message:

Restored the image upload default re-setting code. BugId: 45992

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/wheeljack/lib/MT/Asset/Image.pm

    r952 r956  
    219219 
    220220    my($thumb, $thumb_width, $thumb_height); 
    221     # Save new defaults if requested. 
    222221    if($param->{image_defaults}) { 
    223222        return $app->error($app->translate( 
    224223            'Permission denied setting image defaults for blog #[_2]', $blog_id 
    225224        )) unless $app->{perms}->can_save_image_defaults; 
     225        # Save new defaults if requested. 
    226226        $blog->image_default_set(1); 
    227227        $blog->image_default_wrap_text($param->{wrap_text} ? 1 : 0); 
    …… 
    234234        $blog->image_default_constrain($param->{constrain} ? 1 : 0); 
    235235        $blog->image_default_popup($param->{popup} ? 1 : 0); 
    236         $blog->save; 
    237     } 
     236    } 
     237    else { 
     238        # Reset the image defaults. 
     239        $blog->image_default_set(0); 
     240        $blog->image_default_wrap_text(0); 
     241        $blog->image_default_align(MT::Blog::ALIGN()); 
     242        $blog->image_default_thumb(0); 
     243        $blog->image_default_width(MT::Blog::WIDTH()); 
     244        $blog->image_default_wunits(MT::Blog::UNITS()); 
     245        $blog->image_default_height(MT::Blog::WIDTH()); 
     246        $blog->image_default_hunits(MT::Blog::UNITS()); 
     247        $blog->image_default_constrain(1); 
     248        $blog->image_default_popup(0); 
     249    } 
     250    $blog->save; 
    238251 
    239252    # Thumbnail creation