urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix two bugs in page location in new page creation

master
joey 2006-03-14 06:19:16 +00:00
parent 7f8efe4524
commit b26de7676b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ikiwiki
View File

@ -1020,26 +1020,31 @@ sub cgi_editpage ($$) { #{{{
} }
my @page_locs; my @page_locs;
my $best_loc;
my ($from)=$form->param('from')=~/$config{wiki_file_regexp}/; my ($from)=$form->param('from')=~/$config{wiki_file_regexp}/;
if (! defined $from || ! length $from || if (! defined $from || ! length $from ||
$from ne $form->param('from') || $from ne $form->param('from') ||
$from=~/$config{wiki_file_prune_regexp}/ || $from=~/^\//) { $from=~/$config{wiki_file_prune_regexp}/ || $from=~/^\//) {
@page_locs=$page; @page_locs=$best_loc=$page;
} }
else { else {
my $dir=$from."/"; my $dir=$from."/";
$dir=~s![^/]+/$!!; $dir=~s![^/]+/$!!;
push @page_locs, $dir.$page; push @page_locs, $dir.$page;
push @page_locs, "$from/$page"; push @page_locs, "$from/$page";
$best_loc="$from/$page";
while (length $dir) { while (length $dir) {
$dir=~s![^/]+/$!!; $dir=~s![^/]+/$!!;
push @page_locs, $dir.$page; push @page_locs, $dir.$page;
} }
@page_locs = grep { ! exists
$pagesources{lc($_)} } @page_locs;
} }
$form->tmpl_param("page_select", 1); $form->tmpl_param("page_select", 1);
$form->field(name => "page", type => 'select', $form->field(name => "page", type => 'select',
options => \@page_locs); options => \@page_locs, value => $best_loc);
$form->title("creating $page"); $form->title("creating $page");
} }
elsif ($form->field("do") eq "edit") { elsif ($form->field("do") eq "edit") {