merge hernani -> trunk

[osqa.git] / forum / templatetags / ui_registry.py

diff --git a/forum/templatetags/ui_registry.py b/forum/templatetags/ui_registry.py
index 21ba3bbdc0436ff2b2300df20e39252ec67ff62d..8b28e2c67c1aa063c96c95c168b5003ce813653d 100644 (file)
--- a/forum/templatetags/ui_registry.py
+++ b/forum/templatetags/ui_registry.py
@@ -1,4 +1,5 @@
 from django import template
+from django.conf import settings
 from forum.modules import ui
 import logging
 
@@ -21,10 +22,11 @@ class LoadRegistryNode(template.Node):
                             result += separator
                         result += ui_object.render(context)
             except (KeyError, Exception), e:
-                import traceback
-                logging.error("Exception %s rendering ui objects %s: \n%s" % (
-                    e, ui_object, traceback.format_exc()
-                ))
+                if settings.DEBUG:
+                    import traceback
+                    logging.error("Exception %s rendering ui objects %s: \n%s" % (
+                        e, ui_object, traceback.format_exc()
+                    ))
 
         return result