summaryrefslogtreecommitdiff
path: root/doc/plugins
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2008-11-11 04:40:24 +0100
committerintrigeri <intrigeri@boum.org>2008-11-11 04:40:24 +0100
commit3d8d47d7858ae0e043a28f348fe8aec444d0d35a (patch)
treed82045e31bc409a1c14d74d13c65a051ec95922c /doc/plugins
parent0d8cbfc5e0c1c1408d2d48707fefbd60c12b78a6 (diff)
parent8c47f16dccd8a4dd91f365233690bd8139431249 (diff)
Merge commit 'upstream/master' into prv/po
Diffstat (limited to 'doc/plugins')
-rw-r--r--doc/plugins/contrib/po.mdwn6
-rw-r--r--doc/plugins/format/discussion.mdwn10
2 files changed, 15 insertions, 1 deletions
diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn
index cc19c53b3..4ad0fa063 100644
--- a/doc/plugins/contrib/po.mdwn
+++ b/doc/plugins/contrib/po.mdwn
@@ -118,6 +118,10 @@ Any thoughts on this?
>>> accordingly, but I forgot to update this page at the same time.
>>> Hoping it's not too complicated to relocated an existing remote...
>>> (never done that, I'm a Git beginner as well as a Perl
->>> newbie) --[[intrigeri]]a
+>>> newbie) --[[intrigeri]]
>>>>
>>>> Just a matter of editing .git/config, thanks for the heads up.
+>>>>>
+>>>>> Joey, please have a look at my branch, your help would be really
+>>>>> welcome for the security research, as I'm almost done with what
+>>>>> I am able to do myself in this area. --[[intrigeri]]
diff --git a/doc/plugins/format/discussion.mdwn b/doc/plugins/format/discussion.mdwn
index b7d6ca71c..df8448ed6 100644
--- a/doc/plugins/format/discussion.mdwn
+++ b/doc/plugins/format/discussion.mdwn
@@ -3,3 +3,13 @@ Is there any way to tell if an htmlize hook have been called from a format direc
I am currently modifying the [[contrib/highlightcode]] plugin by [[sabr]] and I wanted to have a different behavior depending on the fact that the htmlize hook is called from a format directive or not. For instance, this could disable the raw copy of the highlighted code. Since I have enabled the keepextension option, I tried to rely on the page extension to decide whenever I have to create the raw file or not but this does not seems a reliable approach.
One possible solution is to add an optional parameter to the htmlize hook (and thus to htmlize function in IkiWiki.pm) which could tell if this is the format directive that called the function but I am not sure that is a good way to do this.
+
+> It's (probably) not just the format directive that has a potential problem here.
+> Imagine a syntax highlighted source code file that contains some other
+> directive, such as table or meta. Such a directive calls `htmlize` on the
+> parameters passed to it.
+>
+> There is one way to detect this ATM. If `%IkiWiki::preprocessing` has
+> anything in it, then ikiwiki is in the middle of handling a preprocessing
+> directive. So you could check that. It's getting into internals, so not
+> ideal.. --[[Joey]]