diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-10-10 15:12:04 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-10-10 15:48:35 -0600 |
| commit | 7658b6725d32488506f28e4867577516f2e4455f (patch) | |
| tree | 4a9cd2e28ae7446820d4954d0f72b7adadc61197 /askbot/setup_templates | |
| parent | 1f90a80a86690aa70b18e8770f55afb88838a8ae (diff) | |
| download | askbot-7658b6725d32488506f28e4867577516f2e4455f.tar.gz askbot-7658b6725d32488506f28e4867577516f2e4455f.tar.bz2 askbot-7658b6725d32488506f28e4867577516f2e4455f.zip | |
Fixed issue with feed, changed settings.py template, fixed issue with
skin loader, fixed urls.py for feeds
fixed bug in messages hack with django 1.4.1
all test pass in 1.3.1, haystack and email parsing tests fails on 1.4.1
Diffstat (limited to 'askbot/setup_templates')
| -rw-r--r-- | askbot/setup_templates/settings.py | 4 | ||||
| -rw-r--r-- | askbot/setup_templates/settings.py.mustache | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py index 11fbefb6..5a0ec4a9 100644 --- a/askbot/setup_templates/settings.py +++ b/askbot/setup_templates/settings.py @@ -87,8 +87,8 @@ SECRET_KEY = 'sdljdfjkldsflsdjkhsjkldgjlsdgfs s ' # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.load_template_source', - 'django.template.loaders.app_directories.load_template_source', + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', #below is askbot stuff for this tuple #'askbot.skins.loaders.load_template_source', #changed due to bug 97 'askbot.skins.loaders.filesystem_load_template_source', diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache index 00612858..4cbc7dce 100644 --- a/askbot/setup_templates/settings.py.mustache +++ b/askbot/setup_templates/settings.py.mustache @@ -91,8 +91,8 @@ SECRET_KEY = 'sdljdfjkldsflsdjkhsjkldgjlsdgfs s ' # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.load_template_source', - 'django.template.loaders.app_directories.load_template_source', + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', #below is askbot stuff for this tuple 'askbot.skins.loaders.filesystem_load_template_source', #'django.template.loaders.eggs.load_template_source', |