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

* Smarter behavior when creating a page and a page of the same name (but 

different location) already exists.
master
joey 2006-05-02 02:57:45 +00:00
parent a7dd176e48
commit e7f97eae60
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
IkiWiki/CGI.pm
View File

@ -360,13 +360,6 @@ sub cgi_editpage ($$) { #{{{
if (! $form->submitted || $form->submitted eq "Preview" ||
! $form->validate) {
if ($form->field("do") eq "create") {
if (exists $pagesources{lc($page)}) {
# hmm, someone else made the page in the
# meantime?
print $q->redirect("$config{url}/".htmlpage($page));
return;
}
my @page_locs;
my $best_loc;
my ($from)=$form->param('from')=~/$config{wiki_file_regexp}/;
@ -395,13 +388,20 @@ sub cgi_editpage ($$) { #{{{
$dir=~s![^/]+/+$!!;
push @page_locs, $dir.$page;
}
@page_locs = grep {
! exists $pagesources{lc($_)} &&
! page_locked($_, $session, 1)
} @page_locs;
}
@page_locs = grep {
! exists $pagesources{lc($_)} &&
! page_locked($_, $session, 1)
} @page_locs;
if (! @page_locs) {
# hmm, someone else made the page in the
# meantime?
print $q->redirect("$config{url}/".htmlpage($page));
return;
}
$form->tmpl_param("page_select", 1);
$form->field(name => "page", type => 'select',
options => \@page_locs, value => $best_loc);

4
debian/changelog vendored
View File

@ -20,8 +20,10 @@ ikiwiki (1.1) UNRELEASED; urgency=low
enabled by default.
* Added brokenlinks plugin, not enabled by default, but rather handy.
* Fix several broken links in the doc wiki.
* Smarter behavior when creating a page and a page of the same name (but
different location) already exists.
-- Joey Hess <joeyh@debian.org> Mon, 1 May 2006 21:01:12 -0400
-- Joey Hess <joeyh@debian.org> Mon, 1 May 2006 22:57:04 -0400
ikiwiki (1.0) unstable; urgency=low