X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/febc8df810701062ed45c129c0e30c504db28849..508b758ebf7d03317c1f1a14ba6006dd83eedd08:/forum/settings/base.py?ds=sidebyside

diff --git a/forum/settings/base.py b/forum/settings/base.py
index ae36e25..0e085e5 100644
--- a/forum/settings/base.py
+++ b/forum/settings/base.py
@@ -1,5 +1,5 @@
 import django.dispatch
-from django.utils.encoding import force_unicode
+from django.utils.encoding import force_unicode, smart_unicode
 from datetime import datetime, timedelta
 import logging
 
@@ -42,7 +42,7 @@ class BaseSetting(object):
         return str(self.value)
 
     def __unicode__(self):
-        return unicode(self.value)
+        return smart_unicode(self.value)
 
     @property
     def value(self):
@@ -60,6 +60,7 @@ class BaseSetting(object):
             return v
         except KeyValue.DoesNotExist:
             self._temp = (self.default, datetime.now() + timedelta(seconds=TMP_MINICACHE_SECONDS))
+            self.save(self.default)
         except Exception, e:
             logging.error("Error retrieving setting from database (%s): %s" % (self.name, str(e)))