* Rename inlinepage to depends, so that it can be used to refer to more

[git.ikiwiki.info.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 2dbb42bc483a042d3231685fc57c9ede74bea9d0..dfb484f6402cc15fba20f577d6be57e57a9dd7fa 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -9,7 +9,7 @@ use HTML::Template;
 use lib '.'; # For use without installation, removed by Makefile.
 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
-            %renderedfiles %pagesources %inlinepages};
+            %renderedfiles %pagesources %depends};
 
 sub usage () { #{{{
        die "usage: ikiwiki [options] source dest\n";
@@ -34,6 +34,7 @@ sub getconfig () { #{{{
                        diffurl => '',
                        anonok => 0,
                        rss => 0,
+                       sanitize => 1,
                        rebuild => 0,
                        refresh => 0,
                        getctime => 0,
@@ -66,6 +67,7 @@ sub getconfig () { #{{{
                        "rss!" => \$config{rss},
                        "cgi!" => \$config{cgi},
                        "notify!" => \$config{notify},
+                       "sanitize!" => \$config{sanitize},
                        "url=s" => \$config{url},
                        "cgiurl=s" => \$config{cgiurl},
                        "historyurl=s" => \$config{historyurl},
@@ -397,8 +399,8 @@ sub loadindex () { #{{{
                        $oldpagemtime{$page}=$items{mtime}[0];
                        $oldlinks{$page}=[@{$items{link}}];
                        $links{$page}=[@{$items{link}}];
-                       $inlinepages{$page}=join(" ", @{$items{inlinepage}})
-                               if exists $items{inlinepage};
+                       $depends{$page}=join(" ", @{$items{depends}})
+                               if exists $items{depends};
                        $renderedfiles{$page}=$items{dest}[0];
                }
                $pagectime{$page}=$items{ctime}[0];
@@ -419,8 +421,8 @@ sub saveindex () { #{{{
                        "src=$pagesources{$page} ".
                        "dest=$renderedfiles{$page}";
                $line.=" link=$_" foreach @{$links{$page}};
-               if (exists $inlinepages{$page}) {
-                       $line.=" inlinepage=$_" foreach split " ", $inlinepages{$page};
+               if (exists $depends{$page}) {
+                       $line.=" depends=$_" foreach split " ", $depends{$page};
                }
                print OUT $line."\n";
        }
@@ -497,9 +499,9 @@ sub main () { #{{{
                loadindex();
                require IkiWiki::Render;
                rcs_update();
-               rcs_notify() if $config{notify};
                rcs_getctime() if $config{getctime};
                refresh();
+               rcs_notify() if $config{notify};
                saveindex();
        }
 } #}}}