* 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
parent
de87149039
commit
c69d6f669a
|
@ -466,8 +466,8 @@ sub cgi_editpage ($$) { #{{{
|
||||||
|
|
||||||
$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 => { map { $_ => pagetitle($_, 1) } @editable_locs },
|
options => [ map { pagetitle($_, 1) } @editable_locs ],
|
||||||
value => $best_loc);
|
value => pagetitle($best_loc, 1));
|
||||||
$form->field(name => "type", type => 'select',
|
$form->field(name => "type", type => 'select',
|
||||||
options => \@page_types);
|
options => \@page_types);
|
||||||
$form->title(sprintf(gettext("creating %s"), pagetitle($page)));
|
$form->title(sprintf(gettext("creating %s"), pagetitle($page)));
|
||||||
|
@ -681,8 +681,8 @@ sub cgi (;$$) { #{{{
|
||||||
cgi_editpage($q, $session);
|
cgi_editpage($q, $session);
|
||||||
}
|
}
|
||||||
elsif ($do eq 'blog') {
|
elsif ($do eq 'blog') {
|
||||||
my $page=titlepage(decode_utf8($q->param('title')));
|
my $page=decode_utf8($q->param('title'));
|
||||||
$page=~s/(\/)/"__".ord($1)."__"/eg; # escape slashes too
|
$page=~s/\// /g; # remove slashes to avoid accidental subpages
|
||||||
# if the page already exists, munge it to be unique
|
# if the page already exists, munge it to be unique
|
||||||
my $from=$q->param('from');
|
my $from=$q->param('from');
|
||||||
my $add="";
|
my $add="";
|
||||||
|
|
|
@ -13,8 +13,12 @@ ikiwiki (1.45) UNRELEASED; urgency=low
|
||||||
image using width and height attributes.
|
image using width and height attributes.
|
||||||
* Also fixes img preview display, the links were wrong in preview before.
|
* Also fixes img preview display, the links were wrong in preview before.
|
||||||
* Add a sparkline plugin.
|
* 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
|
ikiwiki (1.44) unstable; urgency=low
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue