summaryrefslogtreecommitdiffstats
path: root/askbot/startup_procedures.py
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-09-26 16:22:13 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-09-26 16:22:26 -0400
commit1fb8a774c00f8ce38ee97dbe20dea98e47a470f6 (patch)
tree17f2e300740c031637b3b822966efc04a6bd12c5 /askbot/startup_procedures.py
parent2fe61a156cae835c886bb07f932b3da4a15d68c7 (diff)
downloadaskbot-1fb8a774c00f8ce38ee97dbe20dea98e47a470f6.tar.gz
askbot-1fb8a774c00f8ce38ee97dbe20dea98e47a470f6.tar.bz2
askbot-1fb8a774c00f8ce38ee97dbe20dea98e47a470f6.zip
one more fix to tinymce setup error checker
Diffstat (limited to 'askbot/startup_procedures.py')
-rw-r--r--askbot/startup_procedures.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/askbot/startup_procedures.py b/askbot/startup_procedures.py
index b9146189..105500b8 100644
--- a/askbot/startup_procedures.py
+++ b/askbot/startup_procedures.py
@@ -612,13 +612,15 @@ def test_tinymce():
#be possible to debug custom tinymce plugins that are used with askbot
- default_config = getattr(django_settings, 'TINYMCE_DEFAULT_CONFIG', None)
- if default_config:
- if 'convert_urls' in default_config:
- message = "set 'convert_urls':False in TINYMCE_DEFAULT_CONFIG"
+ config = getattr(django_settings, 'TINYMCE_DEFAULT_CONFIG', None)
+ if config:
+ if 'convert_urls' in config:
+ if config['convert_urls'] is not False:
+ message = "set 'convert_urls':False in TINYMCE_DEFAULT_CONFIG"
+ errors.append(message)
else:
message = "add to TINYMCE_DEFAULT_CONFIG\n'convert_urls': False,"
- errors.append(message)
+ errors.append(message)
#check js root setting - before version 0.7.44 we used to have