X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8e0180d8ca6c9b08ed752b92d4c50a5298d8f55a..f7431af308a9b36d1323ff380344cb3092786e19:/IkiWiki/Plugin/remove.pm

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 869d32f93..c8d76368e 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -46,7 +46,7 @@ sub check_canremove ($$$) { #{{{
 
 	# If a user can't upload an attachment, don't let them delete it.
 	# This is sorta overkill, but better safe than sorry.
-	if (! defined IkiWiki::pagetype($pagesources{$page})) {
+	if (! defined pagetype($pagesources{$page})) {
 		if (IkiWiki::Plugin::attachment->can("check_canattach")) {
 			IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
 		}
@@ -110,7 +110,7 @@ sub removal_confirm ($$@) { #{{{
 	
 	my ($f, $buttons)=confirmation_form($q, $session);
 	$f->title(sprintf(gettext("confirm removal of %s"),
-		join(", ", map { IkiWiki::pagetitle($_) } @pages)));
+		join(", ", map { pagetitle($_) } @pages)));
 	$f->field(name => "page", type => "hidden", value => \@pages, force => 1);
 	if (defined $attachment) {
 		$f->field(name => "attachment", type => "hidden",
@@ -210,7 +210,7 @@ sub sessioncgi ($$) { #{{{
 				if (! exists $pagesources{$parent}) {
 					$parent="index";
 				}
-				IkiWiki::redirect($q, $config{url}."/".htmlpage($parent));
+				IkiWiki::redirect($q, urlto($parent, '/', 1));
 			}
 		}
 		else {