From 77ebc0ad8ccefee4bebea2583307d4fea7630f46 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 3 Jul 2008 13:40:30 -0400 Subject: web commit by http://jcflack.myopenid.com/ --- doc/bugs/recentchanges_feed_links.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/recentchanges_feed_links.mdwn b/doc/bugs/recentchanges_feed_links.mdwn index 32073415f..eb543587c 100644 --- a/doc/bugs/recentchanges_feed_links.mdwn +++ b/doc/bugs/recentchanges_feed_links.mdwn @@ -26,3 +26,9 @@ to turn on? --Chapman Flack >>> "recentchanges#someid" will probably work. Probably first by addressing the >>> todo about [[todo/ability_to_force_particular_UUIDs_on_blog_posts]], >>> and then by just using that new ability in the page. --[[Joey]] + +>>>> Ah. The prerequisite todo looks like more than I'd like to take on. +>>>> In the meantime, would it be very involved to change whatever bug now +>>>> optimizes away the change pages, or to simply have all the links in the +>>>> feed point to the recentchanges page itself, with no fragment id? +>>>> Either would be a bit nicer than having broken links in the feed. --Chap -- cgit v1.2.3 From f7755e5e01be3b602a6dd4b6dc0ac200c6d2a657 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 3 Jul 2008 18:20:25 -0400 Subject: web commit by http://jcflack.myopenid.com/ --- doc/bugs/CGI_edit_and_slash_in_page_title.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/bugs/CGI_edit_and_slash_in_page_title.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/CGI_edit_and_slash_in_page_title.mdwn b/doc/bugs/CGI_edit_and_slash_in_page_title.mdwn new file mode 100644 index 000000000..f9f30d05f --- /dev/null +++ b/doc/bugs/CGI_edit_and_slash_in_page_title.mdwn @@ -0,0 +1,16 @@ +Try clicking the Edit link for http://ikiwiki.info/todo/Add_showdown_GUI_input__47__edit/ + +The link produces a query string that the edit CGI interprets to +mean `edit.mdwn` in an `Add showdown GUI input` subpage. + +There's something there now, but only because I created it. When +I first tried it, it came up blank. I tried several different ways +of altering the escaping of the query string to get the real page to +come up, but I never succeeded, so I just grabbed the original text +from git and pasted it into the new page.... + +So somehow the generation of Edit links and the CGI for doing the +editing need to get in agreement on just how they're going to +escape slashes in a page title. + +--Chapman Flack -- cgit v1.2.3 From cb06a01b75132c5bcfce563f436109a717861f45 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 3 Jul 2008 18:21:07 -0400 Subject: web commit by http://jcflack.myopenid.com/ --- doc/bugs/CGI_edit_and_slash_in_page_title.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/bugs') diff --git a/doc/bugs/CGI_edit_and_slash_in_page_title.mdwn b/doc/bugs/CGI_edit_and_slash_in_page_title.mdwn index f9f30d05f..9947a7cda 100644 --- a/doc/bugs/CGI_edit_and_slash_in_page_title.mdwn +++ b/doc/bugs/CGI_edit_and_slash_in_page_title.mdwn @@ -1,4 +1,4 @@ -Try clicking the Edit link for http://ikiwiki.info/todo/Add_showdown_GUI_input__47__edit/ +Try clicking the Edit link for The link produces a query string that the edit CGI interprets to mean `edit.mdwn` in an `Add showdown GUI input` subpage. -- cgit v1.2.3 From 2d64fdd22eba599232dab994747271affa072fe0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 3 Jul 2008 23:00:37 -0400 Subject: web commit by http://tychoish.livejournal.com/ --- doc/bugs/git_fails_to_compile.mdwn | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 doc/bugs/git_fails_to_compile.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/git_fails_to_compile.mdwn b/doc/bugs/git_fails_to_compile.mdwn new file mode 100644 index 000000000..87d509057 --- /dev/null +++ b/doc/bugs/git_fails_to_compile.mdwn @@ -0,0 +1,22 @@ +Background: I'm running ikiwiki on OS X leopard, (a laptop), and I have the wiki running locally, as it's mostly for note taking and personal stuff. Anyway. + +I'd been using svn, but I'm making the leap to git (finally) and moving the wiki over as well... + +The git works great, I am in fact, quite pleased. Here's the problem. When I try and run `ikiwiki --setup [setupfile]` I get the following message: + + Can't exec "git": No such file or directory at /opt/local/lib/perl5/vendor_perl/5.8.8/IkiWiki/Rcs/git.pm line 29. + /Users/tychoish/.ikiwiki/ikiwiki.setup: Cannot exec 'git log --max-count=50 --pretty=raw --raw --abbrev=40 --always -c -r HEAD -- .': No such file or directory + BEGIN failed--compilation aborted at (eval 6) line 139. + + /Users/$HOME/.ikiwiki/ikiwiki.setup: 'git log --max-count=50 --pretty=raw --raw --abbrev=40 --always -c -r HEAD -- .' failed: + BEGIN failed--compilation aborted at (eval 6) line 139. + +--- + +I can get the wiki to compile if: I take the git stuff out of the setup file, if I put `rcs => ""` **or** if I set the the git_master_branch to "". + +I think the problem is that ikiwiki can't deal with the onslaught of such a large quantity of history/log information at once, somehow, because the repository came to this moment with a lot of history that the compiler has to crunch through. How to remedy this, is beyond my skill insight... + +Thanks. + +-- [[tychoish]] -- cgit v1.2.3 From df736d308988bda401a8c20835127a70b8bd901d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 4 Jul 2008 03:14:29 -0400 Subject: web commit by http://subvert.org.uk/~bma/ --- doc/bugs/git_fails_to_compile.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/git_fails_to_compile.mdwn b/doc/bugs/git_fails_to_compile.mdwn index 87d509057..11f123c24 100644 --- a/doc/bugs/git_fails_to_compile.mdwn +++ b/doc/bugs/git_fails_to_compile.mdwn @@ -20,3 +20,5 @@ I think the problem is that ikiwiki can't deal with the onslaught of such a larg Thanks. -- [[tychoish]] + + It looks like it can't find git; what is $PATH set to when ikiwiki is run, and is git in one of those directories? --[[bma]] -- cgit v1.2.3 From 560372bf949cc479f721b852ea1a6df5a035ce17 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 4 Jul 2008 03:21:16 -0400 Subject: web commit by http://subvert.org.uk/~bma/ --- doc/bugs/git_fails_to_compile.mdwn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'doc/bugs') diff --git a/doc/bugs/git_fails_to_compile.mdwn b/doc/bugs/git_fails_to_compile.mdwn index 11f123c24..1d34c3e79 100644 --- a/doc/bugs/git_fails_to_compile.mdwn +++ b/doc/bugs/git_fails_to_compile.mdwn @@ -20,5 +20,4 @@ I think the problem is that ikiwiki can't deal with the onslaught of such a larg Thanks. -- [[tychoish]] - - It looks like it can't find git; what is $PATH set to when ikiwiki is run, and is git in one of those directories? --[[bma]] +> It looks like it can't find git; what is $PATH set to when ikiwiki is run, and is git in one of those directories? --[[bma]] -- cgit v1.2.3 From 69108f446ffe450983d188bf5ae94e6156bf4a17 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 4 Jul 2008 08:03:54 -0400 Subject: web commit by http://tychoish.livejournal.com/: further clarification. --- doc/bugs/git_fails_to_compile.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/git_fails_to_compile.mdwn b/doc/bugs/git_fails_to_compile.mdwn index 1d34c3e79..1135d27b0 100644 --- a/doc/bugs/git_fails_to_compile.mdwn +++ b/doc/bugs/git_fails_to_compile.mdwn @@ -20,4 +20,6 @@ I think the problem is that ikiwiki can't deal with the onslaught of such a larg Thanks. -- [[tychoish]] + > It looks like it can't find git; what is $PATH set to when ikiwiki is run, and is git in one of those directories? --[[bma]] +>> Yeah, ikiwiki and git are both installed underneath macports, which is in the path and works just fine most of the time, and I use macports stuff a lot. -- cgit v1.2.3 From 4d7ccdc8e5f496c959421377d9dd8097d0e5887e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 5 Jul 2008 21:44:03 -0400 Subject: web commit by http://www.openidfrance.fr/beaufils --- doc/bugs/ikiwiki_is_not_truly_localizable.mdwn | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 doc/bugs/ikiwiki_is_not_truly_localizable.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn b/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn new file mode 100644 index 000000000..edb25d270 --- /dev/null +++ b/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn @@ -0,0 +1,25 @@ +A lot of strings in ikiwiki are hardcoded and not taken for locales resources through gettext. This is bad because ikiwiki is thus difficult to spread for non-english users. + +I mean that, for instance in CGI.pm, line like: + +`my @buttons=("Save Page", "Preview", "Cancel");` + +should be written as + +`my @buttons=(gettext("Save Page"), gettext("Preview"), gettext("Cancel"));` + +In standards templates things seems wrongly written too. For instance in page.tmpl line like: + +`
  • Edit
    • ` + +should be written as + +`
    • ` + +with EDITURL_TEXT variable initialized in Render.pm through a gettext call. + +Am I wrong ? + +If not I can spend some time preparing patch for such correction if it can help. + +--[[Bruno]] -- cgit v1.2.3 From 4db44caf060f9d0edc65da35b62e7804a2fa7923 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 5 Jul 2008 21:45:21 -0400 Subject: web commit by http://www.openidfrance.fr/beaufils --- doc/bugs/ikiwiki_is_not_truly_localizable.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/bugs') diff --git a/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn b/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn index edb25d270..4a3241a3c 100644 --- a/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn +++ b/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn @@ -22,4 +22,4 @@ Am I wrong ? If not I can spend some time preparing patch for such correction if it can help. ---[[Bruno]] +-- [[bbb]] -- cgit v1.2.3 From 6a863b58a66836de6280ba73de2624dcee073109 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 5 Jul 2008 21:49:46 -0400 Subject: web commit by http://www.openidfrance.fr/beaufils --- doc/bugs/bbb.mdwn | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/bugs/bbb.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/bbb.mdwn b/doc/bugs/bbb.mdwn new file mode 100644 index 000000000..90ef905a9 --- /dev/null +++ b/doc/bugs/bbb.mdwn @@ -0,0 +1,4 @@ +I am Bruno Beaufils. + +You can find me at [work](http://www.lifl.fr/~beaufils) or at [home](http://bruno.boulgour.com). + -- cgit v1.2.3 From f5dca442fe7d2b45417ae65b8532939848735141 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 5 Jul 2008 21:50:47 -0400 Subject: web commit by http://www.openidfrance.fr/beaufils --- doc/bugs/bbb.mdwn | 3 --- 1 file changed, 3 deletions(-) (limited to 'doc/bugs') diff --git a/doc/bugs/bbb.mdwn b/doc/bugs/bbb.mdwn index 90ef905a9..8b1378917 100644 --- a/doc/bugs/bbb.mdwn +++ b/doc/bugs/bbb.mdwn @@ -1,4 +1 @@ -I am Bruno Beaufils. -You can find me at [work](http://www.lifl.fr/~beaufils) or at [home](http://bruno.boulgour.com). - -- cgit v1.2.3 From f9ddfe56b9b4bb8c33e96263c0ee02c97b93dc4f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 5 Jul 2008 21:51:23 -0400 Subject: web commit by http://www.openidfrance.fr/beaufils --- doc/bugs/ikiwiki_is_not_truly_localizable.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/bugs') diff --git a/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn b/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn index 4a3241a3c..5d1a96fda 100644 --- a/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn +++ b/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn @@ -22,4 +22,4 @@ Am I wrong ? If not I can spend some time preparing patch for such correction if it can help. --- [[bbb]] +-- [[users/bbb]] -- cgit v1.2.3 From 8b59050ea74b5c94dcca85e3509ac3ba384f2f9e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 5 Jul 2008 21:52:03 -0400 Subject: web commit by http://www.openidfrance.fr/beaufils --- doc/bugs/ikiwiki_is_not_truly_localizable.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/bugs') diff --git a/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn b/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn index 5d1a96fda..0ffa9d383 100644 --- a/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn +++ b/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn @@ -22,4 +22,4 @@ Am I wrong ? If not I can spend some time preparing patch for such correction if it can help. --- [[users/bbb]] +-- [[/users/bbb]] -- cgit v1.2.3 From f0ff71af557f56ece79cb39c1103079f565b34cf Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 5 Jul 2008 22:04:12 -0400 Subject: web commit by http://www.openidfrance.fr/beaufils --- doc/bugs/ikiwiki_is_not_truly_localizable.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/bugs') diff --git a/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn b/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn index 0ffa9d383..1f519ddca 100644 --- a/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn +++ b/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn @@ -20,6 +20,6 @@ with EDITURL_TEXT variable initialized in Render.pm through a gettext call. Am I wrong ? -If not I can spend some time preparing patch for such correction if it can help. +If not I can spend some time preparing patches for such corrections if it can help. -- [[/users/bbb]] -- cgit v1.2.3 From bb3036317d6e4102545506f200e594cc67d7589b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 5 Jul 2008 22:18:04 -0400 Subject: web commit by http://www.openidfrance.fr/beaufils --- doc/bugs/bbb.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/bugs') diff --git a/doc/bugs/bbb.mdwn b/doc/bugs/bbb.mdwn index 8b1378917..0d1edf5fe 100644 --- a/doc/bugs/bbb.mdwn +++ b/doc/bugs/bbb.mdwn @@ -1 +1 @@ - +Created too fast. Could someone remove this page ? -- cgit v1.2.3 From 17bb3cec42e8f470722b7f21604ad99448b163fd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Jul 2008 13:58:47 -0400 Subject: rm --- doc/bugs/bbb.mdwn | 1 - 1 file changed, 1 deletion(-) delete mode 100644 doc/bugs/bbb.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/bbb.mdwn b/doc/bugs/bbb.mdwn deleted file mode 100644 index 0d1edf5fe..000000000 --- a/doc/bugs/bbb.mdwn +++ /dev/null @@ -1 +0,0 @@ -Created too fast. Could someone remove this page ? -- cgit v1.2.3 From 674ed7e7060a9af4cfab0d8a29a227a702735e62 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Jul 2008 14:05:01 -0400 Subject: response --- doc/bugs/ikiwiki_is_not_truly_localizable.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn b/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn index 1f519ddca..11bf1cab5 100644 --- a/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn +++ b/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn @@ -8,6 +8,12 @@ should be written as `my @buttons=(gettext("Save Page"), gettext("Preview"), gettext("Cancel"));` +> Yes, these need to be fixed. But note that the localised texts come back +> into ikiwiki and are used in various places, including plugins. +> Including, possibly, third-party plugins. So localising the buttons would +> seem to require converting from the translations back into the C locale +> when the form is posted. --[[Joey]] + In standards templates things seems wrongly written too. For instance in page.tmpl line like: `
  • Edit
    • ` @@ -20,6 +26,13 @@ with EDITURL_TEXT variable initialized in Render.pm through a gettext call. Am I wrong ? +> No, that's not a sane way to localise the templates. The templates can be +> translated by making a copy and modifying it, or by using a tool to +> generate .mo files from the templates, and generate translated templates +> from .po files. (See [[todo/l10n]] for one attempt.) But pushing the +> localisation of random strings in the templates through the ikiwiki +> program defeats the purpose of having templates at all. --[[Joey]] + If not I can spend some time preparing patches for such corrections if it can help. -- [[/users/bbb]] -- cgit v1.2.3 From 4bf778576092c0c12c3252560cfb3c68cffb8f44 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Jul 2008 14:07:33 -0400 Subject: response --- doc/bugs/git_fails_to_compile.mdwn | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/git_fails_to_compile.mdwn b/doc/bugs/git_fails_to_compile.mdwn index 1135d27b0..fdd1df533 100644 --- a/doc/bugs/git_fails_to_compile.mdwn +++ b/doc/bugs/git_fails_to_compile.mdwn @@ -23,3 +23,8 @@ Thanks. > It looks like it can't find git; what is $PATH set to when ikiwiki is run, and is git in one of those directories? --[[bma]] >> Yeah, ikiwiki and git are both installed underneath macports, which is in the path and works just fine most of the time, and I use macports stuff a lot. + +>>> The PATH is set at the top of the ikiwiki program; so the system's PATH +>>> setting, or one in the environment will be ignored. (This is done for +>>> security since ikiwiki can be run setuid.) If you need to use +>>> a nonstandard path, you'll need to edit that. --[[Joey]] -- cgit v1.2.3 From 05124f9a86dadca50c693d57f8fc8398fb5d8be9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Jul 2008 15:52:04 -0400 Subject: editpage escaping fixes * The editpage form now uses the raw page name, not the page title, in its 'page' cgi parameter. Using the title was ambiguous and made it impossible to tell between some pages, like "foo/bar" and "foo__47__bar", sometimes causing the wrong page to be edited. * This change means that some edit links need to be updated. Force a rebuild on upgrade to this version. * Above change also allowed really fixing escaped slashes from the blogpost form. --- IkiWiki.pm | 2 +- IkiWiki/CGI.pm | 11 +++++------ IkiWiki/Plugin/editdiff.pm | 2 +- IkiWiki/Plugin/inline.pm | 8 ++++---- IkiWiki/Render.pm | 2 +- debian/NEWS | 8 ++++++++ debian/changelog | 8 ++++++++ debian/postinst | 2 +- doc/bugs/CGI_edit_and_slash_in_page_title.mdwn | 2 ++ po/ikiwiki.pot | 16 ++++++++-------- 10 files changed, 39 insertions(+), 22 deletions(-) (limited to 'doc/bugs') diff --git a/IkiWiki.pm b/IkiWiki.pm index 03b4b666e..0b420e824 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -596,7 +596,7 @@ sub htmllink ($$$;@) { #{{{ return " "create", - page => pagetitle(lc($link), 1), + page => lc($link), from => $lpage ). "\" rel=\"nofollow\">?$linktext" diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 07e92322f..99cead64f 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -301,10 +301,9 @@ sub cgi_editpage ($$) { #{{{ }); decode_form_utf8($form); - # This untaint is safe because titlepage removes any problematic - # characters. + # This untaint is safe because we check file_pruned. my $page=$form->field('page'); - $page=titlepage(possibly_foolish_untaint($page)); + $page=possibly_foolish_untaint($page); if (! defined $page || ! length $page || file_pruned($page, $config{srcdir}) || $page=~/^\//) { error("bad page name"); @@ -354,7 +353,7 @@ sub cgi_editpage ($$) { #{{{ $form->field(name => "from", type => 'hidden'); $form->field(name => "rcsinfo", type => 'hidden'); $form->field(name => "subpage", type => 'hidden'); - $form->field(name => "page", value => pagetitle($page, 1), force => 1); + $form->field(name => "page", value => $page, force => 1); $form->field(name => "type", value => $type, force => 1); $form->field(name => "comments", type => "text", size => 80); $form->field(name => "editcontent", type => "textarea", rows => 20, @@ -486,8 +485,8 @@ sub cgi_editpage ($$) { #{{{ $form->tmpl_param("page_select", 1); $form->field(name => "page", type => 'select', - options => [ map { pagetitle($_, 1) } @editable_locs ], - value => pagetitle($best_loc, 1)); + options => [ map { [ $_, pagetitle($_, 1) ] } @editable_locs ], + value => $best_loc); $form->field(name => "type", type => 'select', options => \@page_types); $form->title(sprintf(gettext("creating %s"), pagetitle($page))); diff --git a/IkiWiki/Plugin/editdiff.pm b/IkiWiki/Plugin/editdiff.pm index b8ecaa3d7..d45c73e8f 100644 --- a/IkiWiki/Plugin/editdiff.pm +++ b/IkiWiki/Plugin/editdiff.pm @@ -50,7 +50,7 @@ sub formbuilder_setup { #{{{ return if $form->field("do") ne "edit"; - $page = IkiWiki::titlepage(IkiWiki::possibly_foolish_untaint($page)); + $page = IkiWiki::possibly_foolish_untaint($page); return unless exists $pagesources{$page}; push @{$params{buttons}}, "Diff"; diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 344620ebe..8890e5ed0 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -70,12 +70,12 @@ sub sessioncgi () { #{{{ my $session=shift; if ($q->param('do') eq 'blog') { - my $page=decode_utf8($q->param('title')); - $page=~s/\///g; # no slashes in blog posts + my $page=IkiWiki::titlepage(decode_utf8($q->param('title'))); + $page=~s/(\/)/"__".ord($1)."__"/eg; # don't create subdirs # if the page already exists, munge it to be unique my $from=$q->param('from'); my $add=""; - while (exists $IkiWiki::pagecase{lc($from."/".IkiWiki::titlepage($page).$add)}) { + while (exists $IkiWiki::pagecase{lc($from."/".$page.$add)}) { $add=1 unless length $add; $add++; } @@ -278,7 +278,7 @@ sub preprocess_inline (@) { #{{{ } if (length $config{cgiurl} && defined $type) { $template->param(have_actions => 1); - $template->param(editurl => cgiurl(do => "edit", page => pagetitle($page, 1))); + $template->param(editurl => cgiurl(do => "edit", page => $page)); } } diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 5184be2df..c241fd40b 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -80,7 +80,7 @@ sub genpage ($$) { #{{{ my $actions=0; if (length $config{cgiurl}) { - $template->param(editurl => cgiurl(do => "edit", page => pagetitle($page, 1))); + $template->param(editurl => cgiurl(do => "edit", page => $page)); $template->param(prefsurl => cgiurl(do => "prefs")); $actions++; } diff --git a/debian/NEWS b/debian/NEWS index 80da496fb..4aac33b80 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,11 @@ +ikiwiki (2.52) unstable; urgency=low + + All wikis need to be rebuilt on upgrade to this version. If you listed your + wiki in /etc/ikiwiki/wikilist this will be done automatically when the + Debian package is upgraded. Or use ikiwiki-mass-rebuild to force a rebuild. + + -- Joey Hess Sun, 06 Jul 2008 15:10:05 -0400 + ikiwiki (2.49) unstable; urgency=low The search plugin no longer uses hyperestraier. Instead, to use it you diff --git a/debian/changelog b/debian/changelog index e6ffa17de..1e82ee70c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,14 @@ ikiwiki (2.52) UNRELEASED; urgency=low * toggle: Fix to work in preview mode. * toggle: Add javascript to top of page, not to end. This avoids flicker since closed toggles will not be displayed as the page is loading. + * The editpage form now uses the raw page name, not the page title, in its + 'page' cgi parameter. Using the title was ambiguous and made it + impossible to tell between some pages, like "foo/bar" and "foo__47__bar", + sometimes causing the wrong page to be edited. + * This change means that some edit links need to be updated. + Force a rebuild on upgrade to this version. + * Above change also allowed really fixing escaped slashes from the blogpost + form. -- Joey Hess Mon, 30 Jun 2008 19:56:28 -0400 diff --git a/debian/postinst b/debian/postinst index 26c44a88b..0a836a0b2 100755 --- a/debian/postinst +++ b/debian/postinst @@ -4,7 +4,7 @@ set -e # Change this when some incompatible change is made that requires # rebuilding all wikis. -firstcompat=2.30 +firstcompat=2.52 if [ "$1" = configure ] && \ dpkg --compare-versions "$2" lt "$firstcompat"; then diff --git a/doc/bugs/CGI_edit_and_slash_in_page_title.mdwn b/doc/bugs/CGI_edit_and_slash_in_page_title.mdwn index 9947a7cda..ec5763924 100644 --- a/doc/bugs/CGI_edit_and_slash_in_page_title.mdwn +++ b/doc/bugs/CGI_edit_and_slash_in_page_title.mdwn @@ -14,3 +14,5 @@ editing need to get in agreement on just how they're going to escape slashes in a page title. --Chapman Flack + +> bleh. [[Fixed|done]] --[[joey]] diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 8f64da8f7..d052f0b98 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-02 18:08-0400\n" +"POT-Creation-Date: 2008-07-06 15:30-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,7 +24,7 @@ msgstr "" msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:190 ../IkiWiki/CGI.pm:526 +#: ../IkiWiki/CGI.pm:190 ../IkiWiki/CGI.pm:525 msgid "Your login session has expired." msgstr "" @@ -44,30 +44,30 @@ msgstr "" msgid "Preferences saved." msgstr "" -#: ../IkiWiki/CGI.pm:326 +#: ../IkiWiki/CGI.pm:325 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/CGI.pm:437 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/CGI.pm:436 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:266 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95 #: ../IkiWiki/Render.pm:162 msgid "discussion" msgstr "" -#: ../IkiWiki/CGI.pm:493 +#: ../IkiWiki/CGI.pm:492 #, perl-format msgid "creating %s" msgstr "" -#: ../IkiWiki/CGI.pm:511 ../IkiWiki/CGI.pm:539 ../IkiWiki/CGI.pm:549 -#: ../IkiWiki/CGI.pm:583 ../IkiWiki/CGI.pm:628 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:538 ../IkiWiki/CGI.pm:548 +#: ../IkiWiki/CGI.pm:582 ../IkiWiki/CGI.pm:627 #, perl-format msgid "editing %s" msgstr "" -#: ../IkiWiki/CGI.pm:722 +#: ../IkiWiki/CGI.pm:721 msgid "You are banned." msgstr "" -- cgit v1.2.3