Commit 52cb6fe3705655a6a66208a7c17000eb638c8e96
Committed by
Claude Paroz
1 parent
0fd37733
Fixed undefined COMMENTS_ALLOW_PROFANITIES/PROFANITIES_LIST
Showing
2 changed files
with
3 additions
and
2 deletions
| ... | ... | @@ -176,7 +176,8 @@ class CommentDetailsForm(CommentSecurityForm): |
| 176 | 176 | contain anything in PROFANITIES_LIST. |
| 177 | 177 | """ |
| 178 | 178 | comment = self.cleaned_data["comment"] |
| 179 | - if settings.COMMENTS_ALLOW_PROFANITIES == False: | |
| 179 | + if (not getattr(settings, 'COMMENTS_ALLOW_PROFANITIES', False) and | |
| 180 | + getattr(settings, 'PROFANITIES_LIST', False)): | |
| 180 | 181 | bad_words = [w for w in settings.PROFANITIES_LIST if w in comment.lower()] |
| 181 | 182 | if bad_words: |
| 182 | 183 | raise forms.ValidationError(ungettext( | ... | ... |
| ... | ... | @@ -67,7 +67,7 @@ class CommentFormTests(CommentTestCase): |
| 67 | 67 | d = self.getValidData(a) |
| 68 | 68 | |
| 69 | 69 | # Save settings in case other tests need 'em |
| 70 | - saved = settings.PROFANITIES_LIST, settings.COMMENTS_ALLOW_PROFANITIES | |
| 70 | + saved = getattr(settings, 'PROFANITIES_LIST', []), getattr(settings, 'COMMENTS_ALLOW_PROFANITIES', False) | |
| 71 | 71 | |
| 72 | 72 | # Don't wanna swear in the unit tests if we don't have to... |
| 73 | 73 | settings.PROFANITIES_LIST = ["rooster"] | ... | ... |
Please
register
or
login
to post a comment