Changeset 7365

Timestamp:

03/02/08 12:02:08 (5 years ago)

Author:

nyarla

Message:

lang/perl/blosxom/blosxom.nyarla.cgi: warningが出るのを修正

Files:

• lang/perl/blosxom/blosxom.nyarla.cgi (modified) (4 diffs)

lang/perl/blosxom/blosxom.nyarla.cgi

@@ -139 +139 @@
     my ( $path, $chunk, $flavour ) = @_;
     my $dir = $flavour_dir || $datadir;
+    $path ||= q{};
     do {
         if ( $fh->open("${dir}/${path}/${chunk}.${flavour}", '<') ) {
@@ -153 +154 @@
     }
     elsif ( defined $template{'error'}{$chunk} ) {
-        return $template{error}{$chunk} 
+        return $template{'error'}{$chunk} 
     }
     else {
@@ -217 +218 @@
             $files{$name} = $mtime;
 
-            my $check = "${static_dir}/${path}/index.$static_flavours[0]";
-            if ( param('-all') || ! -f $check || stat($check)->mtime < $mtime ) {
-                $indexes{$path} = 1;
-                my $dir = join q{/}, (nice_date($mtime))[5,2,3];
-                $indexes{$dir} = $dir;
-                $indexes{( $path ? '${path}/' : '' )."${fn}.${file_extension}"} = 1
-                    if ( $static_entries );
+            if ( $static_dir && $static_flavours[0] ) {
+                my $check = "${static_dir}/${path}/index.$static_flavours[0]";
+                if ( param('-all') || ! -f $check || stat($check)->mtime < $mtime ) {
+                    $indexes{$path} = 1;
+                    my $dir = join q{/}, (nice_date($mtime))[5,2,3];
+                    $indexes{$dir} = $dir;
+                    $indexes{( $path ? '${path}/' : '' )."${fn}.${file_extension}"} = 1
+                        if ( $static_entries );
+                }
             }
 
@@ -365 +368 @@
                 = ( $path_file =~ m{^$datadir/(?:(.*)/)?(.*)\.$file_extension} );
             # Only stories in the right hierarchy
-            if ( $path !~ m{^$currentdir} && $path_file ne "${datadir}/${currentdir}" ) {
+            if ( ( $path && $path !~ m{^$currentdir} ) && $path_file ne "${datadir}/${currentdir}" ) {
                 next;
             }