Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/Makefile.PL b/Makefile.PL
index 7906f65934f5cf549b697c507b7321b7b97bafcb..df677262b367b4a6ba4884f7cb51ec12f0278f3f 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -50,7 +50,7 @@ extra_build: $(outprogs) ikiwiki.setup docwiki
        ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
        ./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man
        $(MAKE) -C po
-       $(SED) -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec
+       $(SED) -i.bkp "s/Version:.*/Version: $(VER)/" ikiwiki.spec
        rm -f ikiwiki.spec.bkp
        
 docwiki:

diff --git a/doc/examples/blog/posts/first_post.mdwn b/doc/examples/blog/posts/first_post.mdwn
index f76df2f17d4953e05b6a7748a3d4e8ded08eee97..343497d1834f209bb0afc1bb68943fe01a3a0bdd 100644 (file)
--- a/doc/examples/blog/posts/first_post.mdwn
+++ b/doc/examples/blog/posts/first_post.mdwn
@@ -1,4 +1,2 @@
 This is the first post to this example blog. To add new posts, just add
 files to the posts/ subdirectory, or use the web form.
-
-And is this ever edited again ? Looking for blog software and learning perl...

diff --git a/doc/forum/postsignin_redirect_not_working.mdwn b/doc/forum/postsignin_redirect_not_working.mdwn
index fdef56375ef6f440266cd737a487acfed2cf5b37..bc8855b7b29d37df1e1cfd3117410f75fe994a46 100644 (file)
--- a/doc/forum/postsignin_redirect_not_working.mdwn
+++ b/doc/forum/postsignin_redirect_not_working.mdwn
@@ -14,3 +14,17 @@ Then when it runs for postsignin its supposed to pull it out and send the user t
 Full code is available on the plugin page: [[plugins/contrib/justlogin]].
 
 I searched the site and there's very little info available for postsignin or redirect. Perhaps I'm using the wrong function?
+
+> I don't know why you end up on the prefs page. Have you tried
+> looking inside the session database to see what postsignin 
+> parameter is stored?
+> 
+> But, `cgi_postsignin()` assumes it can directly pass the postsignin cgi
+> parameter into `cgi()`. You're expecting it to redirect to an url, and it
+> just doesn't do that. Although I have considered adding a redirect 
+> there, just so that openid login info doesn't appear in the url after
+> signin (which breaks eg, reload). That would likely still not make your
+> code work, since the value of postsignin is a url query string, not a
+> full url.
+> 
+> I'd suggest you put a do=goto redirect into postsignin. --[[Joey]]

diff --git a/t/autoindex.t b/t/autoindex.t
index b38be83138e2709b68041acfeb17ae1ccb0c3eec..d16e44ca8ebca7a14f5d3bcc601b6add1aeae47d 100755 (executable)
--- a/t/autoindex.t
+++ b/t/autoindex.t
@@ -75,8 +75,8 @@ is($autofiles{"deleted.mdwn"}{plugin}, "autoindex");
 %pages = ();
 @del = ();
 IkiWiki::gen_autofile("deleted.mdwn", \%pages, \@del);
-is_deeply(\%pages, {}) || diag explain \%pages;
-is_deeply(\@del, []) || diag explain \@del;
+is_deeply(\%pages, {});
+is_deeply(\@del, []);
 ok(! -f "t/tmp/deleted.mdwn");
 
 # this page is tried as an autofile, but because it'll be in @del, it's not
@@ -86,8 +86,8 @@ ok(! exists $wikistate{autoindex}{autofile}{"gone.mdwn"});
 @del = ("gone.mdwn");
 is($autofiles{"gone.mdwn"}{plugin}, "autoindex");
 IkiWiki::gen_autofile("gone.mdwn", \%pages, \@del);
-is_deeply(\%pages, {}) || diag explain \%pages;
-is_deeply(\@del, ["gone.mdwn"]) || diag explain \@del;
+is_deeply(\%pages, {});
+is_deeply(\@del, ["gone.mdwn"]);
 ok(! -f "t/tmp/gone.mdwn");
 
 # this page does not exist and has no reason to be re-created, but we no longer
@@ -116,8 +116,8 @@ ok(! exists $wikistate{autoindex}{autofile}{"tags.mdwn"});
 @del = ();
 is($autofiles{"tags.mdwn"}{plugin}, "autoindex");
 IkiWiki::gen_autofile("tags.mdwn", \%pages, \@del);
-is_deeply(\%pages, {"t/tmp/tags" => 1}) || diag explain \%pages;
-is_deeply(\@del, []) || diag explain \@del;
+is_deeply(\%pages, {"t/tmp/tags" => 1});
+is_deeply(\@del, []);
 ok(! -s "t/tmp/tags.mdwn");
 ok(-s "t/tmp/.ikiwiki/transient/tags.mdwn");
 
@@ -127,8 +127,8 @@ ok(! exists $wikistate{autoindex}{autofile}{"attached.mdwn"});
 @del = ();
 is($autofiles{"attached.mdwn"}{plugin}, "autoindex");
 IkiWiki::gen_autofile("attached.mdwn", \%pages, \@del);
-is_deeply(\%pages, {"t/tmp/attached" => 1}) || diag explain \%pages;
-is_deeply(\@del, []) || diag explain \@del;
+is_deeply(\%pages, {"t/tmp/attached" => 1});
+is_deeply(\@del, []);
 ok(-s "t/tmp/.ikiwiki/transient/attached.mdwn");
 
 1;

diff --git a/t/tag.t b/t/tag.t
index 8fc4940a2b5a67a871c7d4925a5d77eaec2aba44..cc0a30cadf481c6d0d9be8ad431e67d05f84790e 100755 (executable)
--- a/t/tag.t
+++ b/t/tag.t
@@ -65,8 +65,8 @@ my (%pages, @del);
 IkiWiki::gen_autofile("tags/lucky.mdwn", \%pages, \@del);
 ok(! -s "t/tmp/tags/lucky.mdwn");
 ok(-s "t/tmp/.ikiwiki/transient/tags/lucky.mdwn");
-is_deeply(\%pages, {"t/tmp/tags/lucky" => 1}) || diag explain \%pages;
-is_deeply(\@del, []) || diag explain \@del;
+is_deeply(\%pages, {"t/tmp/tags/lucky" => 1});
+is_deeply(\@del, []);
 
 # generating an autofile that already exists does nothing
 %pages = @del = ();