* 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).

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 8d86d8d3e2b2b415ac0d2e605ae538ee2aec2cef..b884a32f2217e991c8ec05c4f39c40e2eb8af43e 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -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="";

diff --git a/debian/changelog b/debian/changelog
index 5e8ee927250fe17c4ff06deeaee2c5d8eb3f466b..18d1462e96d69c5fcfdaceb3ffcbdda84f592bf0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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