[Mpuls-commits] r3522 - in base/trunk: . mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-09-03 11:33:52 +0200 (Fri, 03 Sep 2010)
New Revision: 3522

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/lib/helpers.py
Log:
* mpulsweb/lib/helpers.py (getHelp): The return value is already
HTML. Wrap it in a literal so that it's not quoted again when used
in a template.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-09-03 09:07:51 UTC (rev 3521)
+++ base/trunk/ChangeLog	2010-09-03 09:33:52 UTC (rev 3522)
@@ -1,3 +1,9 @@
+2010-09-03  Bernhard Herzog  <bh at intevation.de>
+
+	* mpulsweb/lib/helpers.py (getHelp): The return value is already
+	HTML. Wrap it in a literal so that it's not quoted again when used
+	in a template.
+
 2010-08-30  Roland Geider <roland.geider at intevation.de>
 
 	* mpulsweb/lib/config.py: issue990: Change the default dates for the

Modified: base/trunk/mpulsweb/lib/helpers.py
===================================================================
--- base/trunk/mpulsweb/lib/helpers.py	2010-09-03 09:07:51 UTC (rev 3521)
+++ base/trunk/mpulsweb/lib/helpers.py	2010-09-03 09:33:52 UTC (rev 3522)
@@ -172,7 +172,7 @@
         out.append(tag("img", src=url_for('/images/icons/formular/help.png'),
                        alt="help"))
         out.append('</a>')
-    return "".join(out)
+    return literal("".join(out))
 
 def get_app_title():
     return config.get('mpuls.app.title')