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

master
Joey Hess 1997-08-14 07:20:33 -04:00
commit 9dead85cb6
6 changed files with 36 additions and 2 deletions

View File

@ -0,0 +1 @@
Calling ikiwiki with a bunch of options, including the --dumpsetup somefile.setup option creates somefile.setup for later reuse with the --setup option. The destination dir however is not saved in the setup file, it has destdir => ''.

View File

@ -4,4 +4,14 @@ e.g. \[[single\_track\_lines]] becomes "em>lines".
Links with only one underscore are OK. Links with only one underscore are OK.
Update 2008-11-24: The problem only occurs if the CSV data is in an external file. If I load it using data="""...""" then it works fine.
The problem appears to be the call to htmlize inside genrow. If the data is inline, then wikilinks get expanded before they get here, and are OK. If the data is from an external file, the wikilinks aren't expanded, and htmlize will expand \[[single\_track\_lines]] into \[[single<em>track</em>lines]].
Oh, wait, I see the problem. IkiWiki::linkify is only called if the external file doesn't exist. If I remove this check and always call IkiWiki::linkify, then the problem is solved.
(this is inside /usr/share/perl5/IkiWiki/Plugin/table.pm).
I am rather confused what this check does, and the fact the comments are very different for CSV and DSV when the code is the same doesn't seem to help.
-- Brian May -- Brian May

View File

@ -9,7 +9,7 @@ configuration setting.
For example, to limit arbitrary files to 50 kilobytes, but allow For example, to limit arbitrary files to 50 kilobytes, but allow
larger mp3 files to be uploaded by joey into a specific directory, and larger mp3 files to be uploaded by joey into a specific directory, and
check all attachments for virii, something like this could be used: check all attachments for viruses, something like this could be used:
virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb))) virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))

View File

@ -0,0 +1,18 @@
Apache's ErrorDocument directive lets you write a CGI script that will be invoked for all 404s.
IkiWiki could offer one as an optional wrapper; it would do much the same thing that the
existing recentchanges_link (or [[generic___39__do__61__goto__39___for_CGI]]) does when
encountering a nonexistent page.
I think it'd probably have to be a separate CGI script because the environment with which
404 handlers are invoked is somewhat odd, and because it needs to return a 404 status
(having said that, it might make sense for `recentchanges_link` to return 404 rather than
200 anyway if the page doesn't exist).
This would give IkiWiki the behaviour of many other wikis, where visiting a page that
does not yet exist prompts you to create it, without having to invoke the CGI for
successful requests.
Due to [a well-known MSIE misfeature](http://support.microsoft.com/default.aspx?scid=kb;en-us;Q294807),
error output needs to be at least 512 bytes long, so some padding might also be required.
I'm happy to write such a script if there is interest. --[[smcv]]

View File

@ -6,4 +6,4 @@ the same for users. For now I've just cloned the functionality into the comments
plugin, but perhaps this functionality could be renamed to `do=goto` or plugin, but perhaps this functionality could be renamed to `do=goto` or
something, and moved to `IkiWiki/CGI.pm`? something, and moved to `IkiWiki/CGI.pm`?
If there's general approval I'm happy to write a patch. If there's general approval I'm happy to write a patch. --[[smcv]]

View File

@ -0,0 +1,5 @@
It feels like there are a lot of people named Steven Black. While I'm just one of many with my name, sometimes it is actually just me and I've forgotten that I had an account somewhere.
I'm not a doctor, though I would certainly trust any doctor, dentist, or philosopher named Steven Black. (There are several.)
I *am* a huge Ikiwiki fan. I've had my eye on it for many years for personal projects (though I never quite got around to installing it). Recently, however, I managed to convince my coworkers that it would be a good idea for an internal wiki. Boy was I right. The thing is practically designed to be the perfect developer-centered wiki.