Fix in the retag template.

[osqa.git] / forum / settings / base.py

diff --git a/forum/settings/base.py b/forum/settings/base.py
index ae36e25c4a12ea568545d67c81a1188c2e5b4212..0e085e56933e1a245b87a669bbd2b7773c650ae0 100644 (file)
--- a/forum/settings/base.py
+++ b/forum/settings/base.py
@@ -1,5 +1,5 @@
 import django.dispatch
 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
 
 from datetime import datetime, timedelta
 import logging
 


@@ -42,7 +42,7 @@ class BaseSetting(object):
         return str(self.value)
 
     def __unicode__(self):
         return str(self.value)
 
     def __unicode__(self):

-        return unicode(self.value)
+        return smart_unicode(self.value)

 
     @property
     def value(self):
 
     @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))
             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)))
             
         except Exception, e:
             logging.error("Error retrieving setting from database (%s): %s" % (self.name, str(e)))