releasing version 2.31.1

[git.ikiwiki.info.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index ed359bdd77f9dccc1f034cfaca3878ad938f0063..2682e13ae5b6e76ac67df22c59319dba07fac51a 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -85,11 +85,6 @@ sub genpage ($$) { #{{{
                $actions++;
        }
                
                $actions++;
        }
                

-       if ($config{rcs} && exists $config{recentchangespage}) {
-               $template->param(recentchangesurl => urlto($config{recentchangespage}, $page));
-               $actions++;
-       }
-

        if (length $config{historyurl}) {
                my $u=$config{historyurl};
                $u=~s/\[\[file\]\]/$pagesources{$page}/g;
        if (length $config{historyurl}) {
                my $u=$config{historyurl};
                $u=~s/\[\[file\]\]/$pagesources{$page}/g;


@@ -131,6 +126,7 @@ sub genpage ($$) { #{{{
                backlinks => $backlinks,
                more_backlinks => $more_backlinks,
                mtime => displaytime($pagemtime{$page}),
                backlinks => $backlinks,
                more_backlinks => $more_backlinks,
                mtime => displaytime($pagemtime{$page}),

+               ctime => displaytime($pagectime{$page}),

                baseurl => baseurl($page),
        );
 
                baseurl => baseurl($page),
        );
 


@@ -208,7 +204,6 @@ sub render ($) { #{{{
                
                my $output=htmlpage($page);
                writefile($output, $config{destdir}, genpage($page, $content));
                
                my $output=htmlpage($page);
                writefile($output, $config{destdir}, genpage($page, $content));

-               utime($pagemtime{$page}, $pagemtime{$page}, $config{destdir}."/".$output);

        }
        else {
                my $srcfd=readfile($srcfile, 1, 1);
        }
        else {
                my $srcfd=readfile($srcfile, 1, 1);


@@ -234,7 +229,6 @@ sub render ($) { #{{{
                                }
                        }
                });
                                }
                        }
                });

-               utime($pagemtime{$file}, $pagemtime{$file}, $config{destdir}."/".$file);

        }
 } #}}}
 
        }
 } #}}}
 


@@ -334,9 +328,15 @@ sub refresh () { #{{{
                        }
                        $pagecase{lc $page}=$page;
                        if ($config{getctime} && -e "$config{srcdir}/$file") {
                        }
                        $pagecase{lc $page}=$page;
                        if ($config{getctime} && -e "$config{srcdir}/$file") {

-                               $pagectime{$page}=rcs_getctime("$config{srcdir}/$file");
+                               eval {
+                                       my $time=rcs_getctime("$config{srcdir}/$file");
+                                       $pagectime{$page}=$time;
+                               };
+                               if ($@) {
+                                       print STDERR $@;
+                               }

                        }
                        }

-                       elsif (! exists $pagectime{$page}) {
+                       if (! exists $pagectime{$page}) {

                                $pagectime{$page}=mtime(srcfile($file));
                        }
                }
                                $pagectime{$page}=mtime(srcfile($file));
                        }
                }


@@ -376,6 +376,8 @@ sub refresh () { #{{{
                        $pagemtime{$page}=$mtime;
                        if (isinternal($page)) {
                                push @internal, $file;
                        $pagemtime{$page}=$mtime;
                        if (isinternal($page)) {
                                push @internal, $file;

+                               # Preprocess internal page in scan-only mode.
+                               preprocess($page, $page, readfile(srcfile($file)), 1);

                        }
                        else {
                                push @needsbuild, $file;
                        }
                        else {
                                push @needsbuild, $file;