From ec7141942ba1c220a7d52dca072720346d97076c Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Fri, 8 May 2009 16:13:25 -0500
Subject: [PATCH] Instiki 0.16.6

Fix an incompatiblity between form_spam_protect and IE7.
(Thanks to Jason Blevins)
Roll a new version.
---
 CHANGELOG                                     | 25 +++++++++++++++++++
 app/controllers/application_controller.rb     |  2 +-
 .../lib/form_tag_helper_extensions.rb         |  6 ++---
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 73679747..b26f0f77 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,28 @@
+* 0.16.6
+
+New Features:
+* More colour schemes: blue, brown, scarlet red, and plum.
+  (From Jason Blevins)
+* History Pages: created a history page for each wiki page.
+  Link to it and to the "Diff" page from "Recently Revised".
+  (from Jason Blevins)
+* Support for SVG clipping paths
+  (requested by Andrew Stacey)
+* Updated for itex2MML 1.3.8. (You should
+  upgrade that, as well.) Support for blackboard bold lowercase
+  letters and digits.
+
+Bugs Fixed:
+* Fixed several bugs in Maruku, where "greedy" regexps
+  could lead to exponential slowdown on certain inputs.
+* Fixed a bug in listing/deleting links to uploaded video and
+  audio files.
+* Fixed some caching bugs.
+* Removed the defunct list.dsbl.org from anti-spam dnsbl lookups.
+* Resolved a conflict between form_spam_protect plugin and IE7.
+  (thanks to Jason Blevins)
+
+------------------------------------------------------------------------------
 * 0.16.5: Rails 2.3.2
 
 * Runs on the Stable Release, Rails 2.3.2.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 66587bb3..7191726d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -258,7 +258,7 @@ module Instiki
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 16
-    TINY  = 5 
+    TINY  = 6 
     SUFFIX = '(MML+)'
     PRERELEASE =  false
     if PRERELEASE
diff --git a/vendor/plugins/form_spam_protection/lib/form_tag_helper_extensions.rb b/vendor/plugins/form_spam_protection/lib/form_tag_helper_extensions.rb
index fcef5bde..0a7ff9a2 100644
--- a/vendor/plugins/form_spam_protection/lib/form_tag_helper_extensions.rb
+++ b/vendor/plugins/form_spam_protection/lib/form_tag_helper_extensions.rb
@@ -69,7 +69,7 @@ module ActionView
           }
         ]
 
-        kode = "var pos=document;while(pos.lastChild.nodeType==1)pos=pos.lastChild;var hiddenfield=document.createElement('input');hiddenfield.setAttribute('type','hidden');hiddenfield.setAttribute('name','_form_key');hiddenfield.setAttribute('value','"+form_key+"');pos.parentNode.appendChild(hiddenfield);"
+        kode = "var pos=document.documentElement;while(pos && pos.lastChild && pos.lastChild.nodeType==1)pos=pos.lastChild;var hiddenfield=document.createElement('input');hiddenfield.setAttribute('type','hidden');hiddenfield.setAttribute('name','_form_key');hiddenfield.setAttribute('value','"+form_key+"');pos.parentNode.appendChild(hiddenfield);null;"
 
         max_length = kode.length+1 unless max_length>kode.length
 
@@ -82,8 +82,8 @@ module ActionView
           js = "var kode=\n"+js_wrap_quote(js_dbl_quote(kode),79)
           js = js+"\n;var i,c,x;while(eval(kode));"
           js = "function hivelogic_enkoder(){"+js+"}hivelogic_enkoder();"
-          js = '<script type="text/javascript">'+"\n/* <![CDATA[ */\n"+js
-          js = js+"\n/* ]]> */\n</script>\n"
+          js = '<script type="text/javascript">'+"\n<!--//--><![CDATA[//><!--\n"+js
+          js = js+"\n//--><!]]>\n</script>\n"
           result = js unless result.length>max_length
         end