projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into revert
[ikiwiki.git]
/
IkiWiki.pm
diff --git
a/IkiWiki.pm
b/IkiWiki.pm
index d114c9a69d760194e05c788e36a74d4c8ab3c144..466907c9db12ca308aed17a270c57326d0e64aff 100644
(file)
--- a/
IkiWiki.pm
+++ b/
IkiWiki.pm
@@
-717,7
+717,7
@@
sub pagename ($) {
my $type=pagetype($file);
my $page=$file;
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$/) {
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;
my $page=shift;
my $link=shift;
-
return $page eq $link;
+ return $page eq $link;
}
sub htmllink ($$$;@) {
}
sub htmllink ($$$;@) {
@@
-1455,12
+1455,11
@@
sub filter ($$$) {
return $content;
}
return $content;
}
-sub check_canedit ($$$;$
$
) {
+sub check_canedit ($$$;$) {
my $page=shift;
my $q=shift;
my $session=shift;
my $nonfatal=shift;
my $page=shift;
my $q=shift;
my $session=shift;
my $nonfatal=shift;
- my $nosubs=shift;
my $canedit;
run_hooks(canedit => sub {
my $canedit;
run_hooks(canedit => sub {
@@
-1471,7
+1470,6
@@
sub check_canedit ($$$;$$) {
$canedit=1;
}
elsif (ref $ret eq 'CODE') {
$canedit=1;
}
elsif (ref $ret eq 'CODE') {
- error(sprintf(gettext("you are not allowed to change %s"), $page)) if $nosubs && ! $nonfatal;
$ret->() unless $nonfatal;
$canedit=0;
}
$ret->() unless $nonfatal;
$canedit=0;
}
@@
-1771,12
+1769,14
@@
sub template_depends ($$;@) {
my $page=shift;
my ($filename, $tpage, $untrusted)=template_file($name);
my $page=shift;
my ($filename, $tpage, $untrusted)=template_file($name);
+ if (! defined $filename) {
+ error(sprintf(gettext("template %s not found"), $name))
+ }
+
if (defined $page && defined $tpage) {
add_depends($page, $tpage);
}
if (defined $page && defined $tpage) {
add_depends($page, $tpage);
}
-
- return unless defined $filename;
-
+
my @opts=(
filter => sub {
my $text_ref = shift;
my @opts=(
filter => sub {
my $text_ref = shift;
@@
-1941,6
+1941,18
@@
sub rcs_receive () {
$hooks{rcs}{rcs_receive}{call}->();
}
$hooks{rcs}{rcs_receive}{call}->();
}
+sub rcs_preprevert (@) {
+ $hooks{rcs}{rcs_preprevert}{call}->(@_);
+}
+
+sub rcs_revert (@) {
+ $hooks{rcs}{rcs_revert}{call}->(@_);
+}
+
+sub rcs_showpatch (@) {
+ $hooks{rcs}{rcs_showpatch}{call}->(@_);
+}
+
sub add_depends ($$;$) {
my $page=shift;
my $pagespec=shift;
sub add_depends ($$;$) {
my $page=shift;
my $pagespec=shift;