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

diff --git a/doc/bugs/Spam:_recent_changes_discussion.mdwn b/doc/bugs/Spam:_recent_changes_discussion.mdwn
new file mode 100644 (file)
index 0000000..cdaa5b8
--- /dev/null
+++ b/doc/bugs/Spam:_recent_changes_discussion.mdwn
@@ -0,0 +1,7 @@
+We have a weird spam problem on our site - must be something via CGI.
+
+see <http://www.dk0tu.de/recentchanges/discussion/>
+
+The content is changing frequently without being checked into the git repository. Any ideas?
+
+--[[bastla]]

diff --git a/doc/forum/Federated_wiki__63__/comment_2_bbfb11517e968311419a8cd2d77de189._comment b/doc/forum/Federated_wiki__63__/comment_2_bbfb11517e968311419a8cd2d77de189._comment
new file mode 100644 (file)
index 0000000..7fe8366
--- /dev/null
+++ b/doc/forum/Federated_wiki__63__/comment_2_bbfb11517e968311419a8cd2d77de189._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="anarcat"
+ subject="comment 2"
+ date="2014-11-20T03:16:50Z"
+ content="""
+you should probably look at the [[tips/distributed_wikis/]] page, which details a few of those scenarios. --[[anarcat]]
+"""]]

diff --git a/doc/todo/support_multiple_perl_libraries.mdwn b/doc/todo/support_multiple_perl_libraries.mdwn
index 2869b5033902c9953f55351a3c638981f70ab498..b71780f989b252dec222cfc3939564ffad37282f 100644 (file)
--- a/doc/todo/support_multiple_perl_libraries.mdwn
+++ b/doc/todo/support_multiple_perl_libraries.mdwn
@@ -8,4 +8,15 @@ I think the change is a one-liner, but I put this here for discussion before att
 
 [[DavidBremner]]
 
+> I would like this feature too, for the very same reasons.
+>
+> To preserve backward compatibility, I tried to implement it in the following way: if `libdir` is a string, it is (as it is right now), a directory in which plugins can be searched; if `libdir` is an array of strings, it is a list of libdirs. The ideal place to put it in would be in subroutine [checkconfig](http://source.ikiwiki.branchable.com/?p=source.git;a=blob;f=IkiWiki.pm;hb=56f8223f9594ae687099dada0c138d669a6f931f#l569). However, plugins are loaded (and option `libdir` is used) in subroutine [loadplugins](http://source.ikiwiki.branchable.com/?p=source.git;a=blob;f=IkiWiki.pm;hb=56f8223f9594ae687099dada0c138d669a6f931f#l713), which is called [just before `checkconfig`](http://source.ikiwiki.branchable.com/?p=source.git;a=blob;f=ikiwiki.in;hb=729991564ec7e1116fc023c51e73b47af8b6fce7#l143).
+>
+> A solution would be to check `libdir` (and turn it into a list if necessary) somewhere in subroutine [getconfig](http://source.ikiwiki.branchable.com/?p=source.git;a=blob;f=ikiwiki.in;hb=729991564ec7e1116fc023c51e73b47af8b6fce7#l26), but I do not know where to put it not to make it look like a bad hack…
+>
+> Any idea about the best place to preprocess `libdir`? Or any better idea to implement this?
+>
+> [[Louis|spalax]]
+
+
 [[!taglink wishlist]]