Fixes a problem that might allow some users to get multiple badges in some strange...

[osqa.git] / settings_local.py.dist

diff --git a/settings_local.py.dist b/settings_local.py.dist
index aab362a696d4513022fb40a9eb9d5dcdab1265b8..6d0e446708d017463d735cd9a2835da739d01745 100644 (file)
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -1,13 +1,5 @@
 # encoding:utf-8
 import os.path
 # encoding:utf-8
 import os.path

-from django.utils.translation import ugettext as _
-
-def check_local_setting(name, value):
-    local_vars = locals()
-    if name in local_vars and local_vars[name] == value:
-        return True
-    else:
-        return False

 
 SITE_SRC_ROOT = os.path.dirname(__file__)
 LOG_FILENAME = 'django.osqa.log'
 
 SITE_SRC_ROOT = os.path.dirname(__file__)
 LOG_FILENAME = 'django.osqa.log'


@@ -21,7 +13,7 @@ logging.basicConfig(
 )
 
 #ADMINS and MANAGERS
 )
 
 #ADMINS and MANAGERS

-ADMINS = (('Forum Admin', 'forum@example.com'),)
+ADMINS = ()

 MANAGERS = ADMINS
 
 DEBUG = False
 MANAGERS = ADMINS
 
 DEBUG = False


@@ -31,6 +23,7 @@ DEBUG_TOOLBAR_CONFIG = {
 TEMPLATE_DEBUG = DEBUG
 INTERNAL_IPS = ('127.0.0.1',)
 
 TEMPLATE_DEBUG = DEBUG
 INTERNAL_IPS = ('127.0.0.1',)
 

+

 DATABASE_NAME = ''             # Or path to database file if using sqlite3.
 DATABASE_USER = ''               # Not used with sqlite3.
 DATABASE_PASSWORD = ''               # Not used with sqlite3.
 DATABASE_NAME = ''             # Or path to database file if using sqlite3.
 DATABASE_USER = ''               # Not used with sqlite3.
 DATABASE_PASSWORD = ''               # Not used with sqlite3.


@@ -60,19 +53,10 @@ FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
 
 USE_I18N = True
 LANGUAGE_CODE = 'en'
 
 USE_I18N = True
 LANGUAGE_CODE = 'en'

-EMAIL_VALIDATION = 'off' #string - on|off
-MIN_USERNAME_LENGTH = 1
-EMAIL_UNIQUE = False

 
 

-WIKI_ON = True
-FEEDBACK_SITE_URL = None #None or url
-EDITABLE_SCREEN_NAME = False #True or False - can user change screen name?
+EMAIL_VALIDATION = 'off' #string - on|off

 
 DJANGO_VERSION = 1.1
 
 DJANGO_VERSION = 1.1

-RESOURCE_REVISION=4
-

 OSQA_DEFAULT_SKIN = 'default'
 
 DISABLED_MODULES = ['books', 'recaptcha', 'project_badges']
 OSQA_DEFAULT_SKIN = 'default'
 
 DISABLED_MODULES = ['books', 'recaptcha', 'project_badges']

-
-from forum.settings import *
\ No newline at end of file