* The slash escaping when adding to a blog from the CGI was not working

since it ended up being double-escaped. Instead, just remove slashes.
* Fix some nasty issues with page name escaping during previewing
  (introduced in 1.44).
master
joey 2007-03-07 09:23:13 +00:00
parent de87149039
commit c69d6f669a
2 changed files with 9 additions and 5 deletions

View File

@ -466,8 +466,8 @@ sub cgi_editpage ($$) { #{{{
$form->tmpl_param("page_select", 1);
$form->field(name => "page", type => 'select',
options => { map { $_ => pagetitle($_, 1) } @editable_locs },
value => $best_loc);
options => [ map { pagetitle($_, 1) } @editable_locs ],
value => pagetitle($best_loc, 1));
$form->field(name => "type", type => 'select',
options => \@page_types);
$form->title(sprintf(gettext("creating %s"), pagetitle($page)));
@ -681,8 +681,8 @@ sub cgi (;$$) { #{{{
cgi_editpage($q, $session);
}
elsif ($do eq 'blog') {
my $page=titlepage(decode_utf8($q->param('title')));
$page=~s/(\/)/"__".ord($1)."__"/eg; # escape slashes too
my $page=decode_utf8($q->param('title'));
$page=~s/\// /g; # remove slashes to avoid accidental subpages
# if the page already exists, munge it to be unique
my $from=$q->param('from');
my $add="";

6
debian/changelog vendored
View File

@ -13,8 +13,12 @@ ikiwiki (1.45) UNRELEASED; urgency=low
image using width and height attributes.
* Also fixes img preview display, the links were wrong in preview before.
* Add a sparkline plugin.
* The slash escaping when adding to a blog from the CGI was not working
since it ended up being double-escaped. Instead, just remove slashes.
* Fix some nasty issues with page name escaping during previewing
(introduced in 1.44).
-- Joey Hess <joeyh@debian.org> Wed, 7 Mar 2007 00:16:01 -0500
-- Joey Hess <joeyh@debian.org> Wed, 7 Mar 2007 03:59:39 -0500
ikiwiki (1.44) unstable; urgency=low