diff options
author | Joey Hess <joey@kitenet.net> | 2010-11-29 14:43:57 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2010-11-29 14:43:57 -0400 |
commit | 0ae1e4cc0e598eacfeb508d11db81c33169631fd (patch) | |
tree | f779fd1bd4b4eaae315473ea70f9c1e85a7981d1 /IkiWiki/Plugin/recentchanges.pm | |
parent | b3f7c6a9a579208f555a9ae7a409474d68897d04 (diff) | |
parent | 18bb93f5744c1b57b929d9f8a6042e51fc5256f0 (diff) | |
download | ikiwiki-0ae1e4cc0e598eacfeb508d11db81c33169631fd.tar ikiwiki-0ae1e4cc0e598eacfeb508d11db81c33169631fd.tar.gz |
Merge remote branch 'smcv/ready/localurl'
Diffstat (limited to 'IkiWiki/Plugin/recentchanges.pm')
-rw-r--r-- | IkiWiki/Plugin/recentchanges.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 562f61d40..de12bb2c6 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -84,7 +84,7 @@ sub sessioncgi ($$) { method => 'POST', javascript => 0, params => $q, - action => $config{cgiurl}, + action => IkiWiki::cgiurl(), stylesheet => 1, template => { template('revert.tmpl') }, fields => [qw{revertmessage do sid rev}], @@ -127,7 +127,7 @@ sub sessioncgi ($$) { exit 0; } - IkiWiki::redirect($q, urlto($config{recentchangespage}, '')); + IkiWiki::redirect($q, urlto($config{recentchangespage}, undef)); exit 0; } @@ -178,7 +178,7 @@ sub store ($$$) { else { $_->{link} = pagetitle($_->{page}); } - $_->{baseurl}="$config{url}/" if length $config{url}; + $_->{baseurl}=IkiWiki::baseurl(undef) if length $config{url}; $_; } @{$change->{pages}} @@ -226,7 +226,7 @@ sub store ($$$) { wikiname => $config{wikiname}, ); - $template->param(permalink => "$config{url}/$config{recentchangespage}/#change-".titlepage($change->{rev})) + $template->param(permalink => urlto($config{recentchangespage}, undef)."#change-".titlepage($change->{rev})) if exists $config{url}; IkiWiki::run_hooks(pagetemplate => sub { |