X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=general%2Finterpolate_fancy;h=9eaf045219c4fef24b400a5630130ebddb2d9471;hb=75362f33a0c5b0ba50c4ea9c530ae9c349992604;hp=4b8b759777373a01aa5093a56b6d6b4151caeb2e;hpb=57919bf75b3031f3abab6d697de2ce354588a38d;p=matthijs%2Fupstream%2Fblosxom-plugins.git

diff --git a/general/interpolate_fancy b/general/interpolate_fancy
index 4b8b759..9eaf045 100644
--- a/general/interpolate_fancy
+++ b/general/interpolate_fancy
@@ -109,8 +109,8 @@ sub do_interpolate {
     # Halt recursive interpolation of story $body
     # by mangling interpolation tags (to be unmangled in a moment)
     unless ($recurse_into_story) {
-      $blosxom::title =~ s/<(\@|\??\$)/<#INTERPOLATE_FANCY_DEFANG#$1/gsi;
-      $blosxom::body =~ s/<(\@|\??\$)/<#INTERPOLATE_FANCY_DEFANG#$1/gsi;
+      $blosxom::title =~ s/<(\@|\??\$)/<#INTERPOLATE_FANCY_DEFANG#$1/gsi if defined $blosxom::title;
+      $blosxom::body =~ s/<(\@|\??\$)/<#INTERPOLATE_FANCY_DEFANG#$1/gsi if defined $blosxom::body;
     }
 
     my $template = shift;
@@ -176,7 +176,9 @@ sub _action {
   my($plugin, $action, $attr, $content) = @_;
   my $result;
 
-  $content =~ s#<\@((?:\w|::)+?)\.(\w+?)\s+?(.+?)?(?:>(.*?)<\/\@\1\.\2>|\s+?\/>)#&interpolate_fancy::_action($1,$2,$3,$4)#gse;
+  if (defined $content) {
+    $content =~ s#<\@((?:\w|::)+?)\.(\w+?)\s+?(.+?)?(?:>(.*?)<\/\@\1\.\2>|\s+?\/>)#&interpolate_fancy::_action($1,$2,$3,$4)#gse;
+  }
 
   my $attributes = interpolate_fancy::_attributes($attr);