From e1d456a86ff808f1bc8e73c7c5d882017bd48d89 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 10 Apr 2008 17:39:51 -0400
Subject: [PATCH] Fix missing import of escapeHTML in userlink. (Scott Bronson)
---
IkiWiki.pm | 3 +++
debian/changelog | 6 ++++++
doc/bugs/Undefined_subroutine_IkiWiki::escapeHTML.mdwn | 5 +++++
3 files changed, 14 insertions(+)
diff --git a/IkiWiki.pm b/IkiWiki.pm
index d1b65cd51..68047b9b9 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -621,6 +621,9 @@ sub userlink ($) { #{{{
return "<a href=\"$user\">$oiduser</a>";
}
else {
+ eval q{use CGI 'escapeHTML'};
+ error($@) if $@;
+
return htmllink("", "", escapeHTML(
length $config{userdir} ? $config{userdir}."/".$user : $user
), noimageinline => 1);
diff --git a/debian/changelog b/debian/changelog
index a1797b8ef..7d02f5924 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (2.43) UNRELEASED; urgency=low
+
+ * Fix missing import of escapeHTML in userlink. (Scott Bronson)
+
+ -- Joey Hess <joeyh@debian.org> Thu, 10 Apr 2008 17:36:53 -0400
+
ikiwiki (2.42) unstable; urgency=high
* aggregate: Correct a mistake in the code that dummy up a guid for feeds
diff --git a/doc/bugs/Undefined_subroutine_IkiWiki::escapeHTML.mdwn b/doc/bugs/Undefined_subroutine_IkiWiki::escapeHTML.mdwn
index f1f27eba8..3efbb65a0 100644
--- a/doc/bugs/Undefined_subroutine_IkiWiki::escapeHTML.mdwn
+++ b/doc/bugs/Undefined_subroutine_IkiWiki::escapeHTML.mdwn
@@ -19,3 +19,8 @@ This patch appears to fix it for me:
), noimageinline => 1);
That's dirty and wrong though... Can you suggest a better fix? -- [[sabr]]
+
+> Hmm, I think I've not noticed this because the openid plugin hides it.
+> Bet you have openid disabled.
+>
+> Anyway, your fix is fine, [[applied|done]]. --[[Joey]]
--
2.39.5