--- a/templates/channel_search.tmpl	Mon Feb 09 11:05:53 2009 +0200
+++ b/templates/channel_search.tmpl	Mon Feb 09 11:46:17 2009 +0200
@@ -1,6 +1,6 @@
 <%inherit file="channel.tmpl" />
 
-% if not query :
+% if not search_query :
 <div id="title">${channel.title} :: Search</div>
 
 <form action="${h.build_url(urls.channel_search, channel=channel)}" method="GET">
@@ -13,9 +13,9 @@
 <p>Search for something.</p>
 
 % else :
-<div id="title">${channel.title} :: Search '${query}'</div>
+<div id="title">${channel.title} :: Search '${search_query}'</div>
 
 % for line in lines:
-${line}\
+${line}
 % endfor
 % endif