Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org

[people/shoehn/ipfire.org.git] / webapp / ui_modules.py

diff --git a/webapp/ui_modules.py b/webapp/ui_modules.py
index c1de1d0cd765c31f7aa8e9bfe167e05e42f55144..e74049115df0e930f9fc237fef6f2cfc24e2f4aa 100644 (file)
--- a/webapp/ui_modules.py
+++ b/webapp/ui_modules.py
@@ -13,8 +13,6 @@ import tornado.locale
 import tornado.web
 import unicodedata
 
-from tornado.database import Row
-
 class UIModule(tornado.web.UIModule):
        @property
        def accounts(self):
@@ -214,7 +212,7 @@ class NewsItemModule(UIModule):
                        item.text = item.text[:400] + "..."
 
                # Render text
-               item.text = textile.textile(item.text)
+               item.text = textile.textile(item.text.decode("utf8"))
 
                return self.render_string("modules/news-item.html", item=item,
                        uncut=uncut, announcement=announcement, show_heading=show_heading)
@@ -346,7 +344,7 @@ class TrackerPeerListModule(UIModule):
                                peer["hostname"] = ""
 
                return self.render_string("modules/tracker-peerlist.html",
-                       peers=[Row(p) for p in peers])
+                       peers=[backend.database.Row(p) for p in peers])
 
 
 class WishlistModule(UIModule):