merge from maint-0-7

Richard Jones · Richard Jones · commit a48e2723e103 · 2004-11-05T20:48:35.000Z
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -51,6 +51,7 @@ Fixed:
 - applied patch fixing some form handling issues in ZRoundup (sf bug 995565)
 - enforce View Permission when serving file content (sf bug 1050470)
 - don't index common words (sf bug 1046612)
+- don't wrap query.item.html in a <span> (thanks Roch'e Compaan)
 
 
 2004-10-15 0.7.8
diff --git a/templates/classic/html/query.item.html b/templates/classic/html/query.item.html
@@ -1,3 +1,3 @@
 <!-- query.item -->
-<span tal:content="structure context/renderQueryForm" />
+<span tal:replace="structure context/renderQueryForm" />
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`<!-- query.item -->`
`2`		`-<span tal:content="structure context/renderQueryForm" />`
	`2`	`+<span tal:replace="structure context/renderQueryForm" />`
`3`	`3`