Index: /package_branches/invirt-web/cherrypy/code/templates/functions.mako
===================================================================
--- /package_branches/invirt-web/cherrypy/code/templates/functions.mako	(revision 2400)
+++ /package_branches/invirt-web/cherrypy/code/templates/functions.mako	(revision 2401)
@@ -1,2 +1,3 @@
+<%page expression_filter="h"/>
 <%def name="databaseList(lst, default, onchange, name, id, valueattr, descattr)">
 <select name="${name}" id="${id}"\
@@ -16,10 +17,10 @@
 <%def name="cdromList(default='', onchange=None)">
 ${databaseList(sorted(database.CDROM.query(), key=lambda x: x.description),
-               default, onchange, 'cdrom', 'cdromlist', 'cdrom_id', 'description')}
+               default, onchange, 'cdrom', 'cdromlist', 'cdrom_id', 'description')|n}
 </%def>
 
 <%def name="autoList(default='', onchange=None)">
 ${databaseList(sorted(database.Autoinstall.query(), key=lambda x: x.description),
-               default, onchange, 'autoinstall', 'autoinstalllist', 'autoinstall_id', 'description')}
+               default, onchange, 'autoinstall', 'autoinstalllist', 'autoinstall_id', 'description')|n}
 </%def>