Merge branch 'master' into revert

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index e2b2ceda301ba064bd8808f0421d16a74fc08362..466907c9db12ca308aed17a270c57326d0e64aff 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -717,7 +717,7 @@ sub pagename ($) {
 
        my $type=pagetype($file);
        my $page=$file;
-       $page=~s/\Q.$type\E*$//
+       $page=~s/\Q.$type\E*$//
                if defined $type && !$hooks{htmlize}{$type}{keepextension}
                        && !$hooks{htmlize}{$type}{noextension};
        if ($config{indexpages} && $page=~/(.*)\/index$/) {
@@ -1124,7 +1124,7 @@ sub isselflink ($$) {
        my $page=shift;
        my $link=shift;
 
-        return $page eq $link;
+       return $page eq $link;
 }
 
 sub htmllink ($$$;@) {
@@ -1941,7 +1941,7 @@ sub rcs_receive () {
        $hooks{rcs}{rcs_receive}{call}->();
 }
 
-sub rcs_preprevert ($) {
+sub rcs_preprevert (@) {
        $hooks{rcs}{rcs_preprevert}{call}->(@_);
 }
 
@@ -1949,7 +1949,7 @@ sub rcs_revert (@) {
        $hooks{rcs}{rcs_revert}{call}->(@_);
 }
 
-sub rcs_showpatch ($) {
+sub rcs_showpatch (@) {
        $hooks{rcs}{rcs_showpatch}{call}->(@_);
 }