summaryrefslogtreecommitdiffstats
path: root/askbot/context.py
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-08-15 15:18:44 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-08-15 15:18:44 -0400
commitc058efb19d537bb4bc3237ac90a6a56174c8929b (patch)
treec6d67094feacea93fe90ded726f10b11730f50ef /askbot/context.py
parent56522105802d0c1850ca2c8084b5cf2bb09fb640 (diff)
downloadaskbot-c058efb19d537bb4bc3237ac90a6a56174c8929b.tar.gz
askbot-c058efb19d537bb4bc3237ac90a6a56174c8929b.tar.bz2
askbot-c058efb19d537bb4bc3237ac90a6a56174c8929b.zip
option to forbid email address in the screen name and displayed allowed file extensions in the image/attachment insertion
Diffstat (limited to 'askbot/context.py')
-rw-r--r--askbot/context.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/askbot/context.py b/askbot/context.py
index 03a2d1d8..3422c701 100644
--- a/askbot/context.py
+++ b/askbot/context.py
@@ -24,6 +24,8 @@ def application_settings(request):
return {}
my_settings = askbot_settings.as_dict()
my_settings['LANGUAGE_CODE'] = getattr(request, 'LANGUAGE_CODE', settings.LANGUAGE_CODE)
+ my_settings['ALLOWED_UPLOAD_FILE_TYPES'] = \
+ settings.ASKBOT_ALLOWED_UPLOAD_FILE_TYPES
my_settings['ASKBOT_URL'] = settings.ASKBOT_URL
my_settings['STATIC_URL'] = settings.STATIC_URL
my_settings['ASKBOT_CSS_DEVEL'] = getattr(