Changeset 16852

Timestamp:

2008-08-16T16:39:57+12:00 (16 years ago)

Author:

kjdon

Message:

no_block no longer affects blocking cover images. setting block_exp now switches off the default 'smart' blocking

File:

• gsdl/trunk/perllib/plugins/BasePlugin.pm (modified) (1 diff)

gsdl/trunk/perllib/plugins/BasePlugin.pm

@@ -414 +414 @@
     }
    
-    $self->store_block_files($filename_full_path, $block_hash) unless $self->{'no_blocking'};
+    # if we have a block_exp, then this overrides the normal 'smart' blocking
+    $self->store_block_files($filename_full_path, $block_hash) unless ($self->{'no_blocking'} || $self->{'block_exp'} ne "");
 
     # block the cover image if there is one
     if ($self->{'cover_image'}) {
-    $self->block_cover_image($filename_full_path, $block_hash) unless $self->{'no_blocking'};
+    $self->block_cover_image($filename_full_path, $block_hash); 
     }