Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
commit
44d4f086ef
|
@ -6,3 +6,5 @@ It would be nice if the [[aggregate_plugin|plugin/aggregate]] would try to extra
|
||||||
# time on record for the new page.
|
# time on record for the new page.
|
||||||
utime $mtime, $mtime, pagefile($guid->{page})
|
utime $mtime, $mtime, pagefile($guid->{page})
|
||||||
if defined $mtime && $mtime <= time;
|
if defined $mtime && $mtime <= time;
|
||||||
|
|
||||||
|
>> I'll have to debug this, it's not working here... and this is an ikiwiki aggregator scraping another ikiwiki site.
|
||||||
|
|
|
@ -1,15 +1,19 @@
|
||||||
The htmltidy plugin as in the Backports.org version 2.32.3~bpo40+1 of ikiwiki does not play well with other usages of HTML Tidy since it has no possibility to use an alternative config file.
|
The htmltidy plugin as in the Backports.org version 2.32.3~bpo40+1 of ikiwiki does not play well with other usages of HTML Tidy since it has no possibility to use an alternative config file.
|
||||||
|
|
||||||
E.g. since I usually use HTML Tidy manually only to check and not to fix HTML, I have "write-back: no" in my $HOME/.tidyrc which throws an awful lot of Perl warnings and renders all ikiwiki pages empty as soon as I enable htmltidy.
|
E.g. since I usually use HTML Tidy manually only to check and not to fix HTML, I have "markup: no" in my $HOME/.tidyrc which throws an awful lot of Perl warnings and renders all ikiwiki pages empty as soon as I enable htmltidy.
|
||||||
|
|
||||||
I see two possibilities how to fix this:
|
I see two possibilities how to fix this:
|
||||||
|
|
||||||
1) Replace "$pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes -
|
1) Replace "$pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes -
|
||||||
-show-warnings no --tidy-mark no');" by "$pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes -
|
-show-warnings no --tidy-mark no');" by "$pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes -
|
||||||
-show-warnings no --tidy-mark no --write-back yes');" -- This is the fastest fix, but not very elegant, since it doesn't solve the general problem.
|
-show-warnings no --tidy-mark no --markup yes');" -- This is the fastest fix, but not very elegant, since it doesn't solve the general problem.
|
||||||
|
|
||||||
2) Make it configurable via ikiwiki.setup as e.g.with the tags plugin. Haven't looked into this code yet.
|
2) Make it configurable via ikiwiki.setup as e.g.with the tags plugin. Haven't looked into this code yet.
|
||||||
|
|
||||||
> I don't understand why you're talking about setting --write-back. The
|
> I don't understand why you're talking about setting --write-back. The
|
||||||
> htmltidy plugin communicates with tidy using stdio. No files are used, so
|
> htmltidy plugin communicates with tidy using stdio. No files are used, so
|
||||||
> write-back settings should be irrelevant. --[[Joey]]
|
> write-back settings should be irrelevant. --[[Joey]]
|
||||||
|
|
||||||
|
>> Hmmm, ok. Well, it didn't work. Empty pages, Perl Warnings. I moved my $HOME/.tidyrc away and it worked again. Had a short look into it and the only obvious non-default setting I found was write-back. I'll check what exactly caused the breakage and let you know. --[[XTaran]]
|
||||||
|
|
||||||
|
>>> Ok, found it. It indeed wasn't `write-back`, but `markup: no`. (I usually only want to see warnings and errors, not the fixed markup.) I now've corrected this in the bug report above. --[[XTaran]]
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
If the rst2html procedure of the rst external plugin returns None (e.g. when it throws an exception), then ikiwiki will render
|
||||||
|
|
||||||
|
<div id="content">
|
||||||
|
2/8
|
||||||
|
</div>
|
||||||
|
|
||||||
|
In addition to the broken plugin, this seems like a bug in ikiwiki, which should probably output an informational message about the plugin returning an invalid value.
|
||||||
|
|
||||||
|
--[[madduck]]
|
|
@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
|
||||||
OpenID, and see how OpenID works for you. And let me know your feelings about
|
OpenID, and see how OpenID works for you. And let me know your feelings about
|
||||||
making such a switch. --[[Joey]]
|
making such a switch. --[[Joey]]
|
||||||
|
|
||||||
[[poll 46 "Accept only OpenID for logins" 17 "Accept only password logins" 33 "Accept both"]]
|
[[poll 51 "Accept only OpenID for logins" 17 "Accept only password logins" 34 "Accept both"]]
|
||||||
|
|
|
@ -35,3 +35,11 @@ only Apache/iptables rules for this? Maybe it's related to
|
||||||
>> Qatar Wikipedia pages and the admins of Wikipedia had to ban all
|
>> Qatar Wikipedia pages and the admins of Wikipedia had to ban all
|
||||||
>> IP addresses of that country (fortunately Qatar has only one ISP).
|
>> IP addresses of that country (fortunately Qatar has only one ISP).
|
||||||
>> --[[Paweł|ptecza]]
|
>> --[[Paweł|ptecza]]
|
||||||
|
|
||||||
|
----
|
||||||
|
|
||||||
|
## Error voting
|
||||||
|
|
||||||
|
> Error: /srv/web/ikiwiki.info/todo/Configurable_minimum_length_of_log_message_for_web_edits/index.html independently created, not overwriting with version from todo/Configurable_minimum_length_of_log_message_for_web_edits
|
||||||
|
|
||||||
|
[[jondowland]]
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
|
This is the SandBox, a page anyone can edit to try out ikiwiki.
|
||||||
|
|
||||||
|
|
||||||
This is the SandBox, a page anyone can edit to try out this fab ikiwiki.
|
|
||||||
|
|
||||||
Testing right-to-left text: (שרה) should be spelled shin (ש) resh (ר) heh (ה) from right to left.
|
Testing right-to-left text: (שרה) should be spelled shin (ש) resh (ר) heh (ה) from right to left.
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
[[!meta title="CGI method to pull/refresh"]]
|
||||||
|
|
||||||
|
In some situations, it makes sense to have the repository in use by ikiwiki reside on a different machine. In that case, one could juggle SSH keys for the `post-update` hook. A better way may be to provide a different `do` parameter handler for the CGI, which would pull new commits to the working clone and refresh the wiki. Then, the remote `post-update` hook could just `wget` that URL. To prevent simple DoS attacks, one might assign a simple password.
|
||||||
|
|
||||||
|
[[tag wishlist]]
|
|
@ -0,0 +1,3 @@
|
||||||
|
It would be nice to specify a minimum length for the change log for web edits, and if it's only required vs. non-required. I realise this is not going to solve the problem of crap log messages, but it helps guard against accidental submissions which one would have logged. Mediawiki/wikipedia has that option, and I find it a useful reminder. --[[madduck]]
|
||||||
|
|
||||||
|
[[tag wishlist]]
|
|
@ -1,4 +1,7 @@
|
||||||
<http://people.debian.org/~madduck>
|
My sites:
|
||||||
|
|
||||||
|
- [Homepage](http://madduck.net)
|
||||||
|
- [Debian stuff](http://people.debian.org/~madduck)
|
||||||
|
|
||||||
I track this site with the following feed:
|
I track this site with the following feed:
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue