Accepting incoming merge of the jambazov feature branch. Mostly includes new bug...

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

diff --git a/forum/settings/__init__.py b/forum/settings/__init__.py
index 9b0cbed037702599ddd57605e223b820a896a94f..e10fc76b0f6f1fb0a3ddb6dcce1a3b3e3a103d9a 100644 (file)
--- a/forum/settings/__init__.py
+++ b/forum/settings/__init__.py
@@ -16,7 +16,8 @@ DJSTYLE_ADMIN_INTERFACE = Setting('DJSTYLE_ADMIN_INTERFACE', True)
 NODE_MAN_FILTERS = Setting('NODE_MAN_FILTERS', [])
 
 APP_URL = djsettings.APP_URL
 NODE_MAN_FILTERS = Setting('NODE_MAN_FILTERS', [])
 
 APP_URL = djsettings.APP_URL

-FORUM_SCRIPT_ALIAS = djsettings.FORUM_SCRIPT_ALIAS
+APP_BASE_URL = djsettings.APP_BASE_URL
+FORCE_SCRIPT_NAME = djsettings.FORCE_SCRIPT_NAME

 OSQA_SKIN = djsettings.OSQA_DEFAULT_SKIN
 LANGUAGE_CODE = djsettings.LANGUAGE_CODE
 ADMIN_MEDIA_PREFIX = djsettings.ADMIN_MEDIA_PREFIX
 OSQA_SKIN = djsettings.OSQA_DEFAULT_SKIN
 LANGUAGE_CODE = djsettings.LANGUAGE_CODE
 ADMIN_MEDIA_PREFIX = djsettings.ADMIN_MEDIA_PREFIX