made tags not required by option in the AskByEmailForm

1 files changed, 16 insertions, 10 deletions

diff --git a/askbot/forms.py b/askbot/forms.py
index b444b55e..1816c202 100644
--- a/askbot/forms.py
+++ b/askbot/forms.py
@@ -673,21 +673,27 @@ class AskByEmailForm(forms.Form):
         ``tagnames`` and ``title``
         """
         raw_subject = self.cleaned_data['subject'].strip()
-        subject_re = re.compile(r'^\[([^]]+)\](.*)$')
+        if askbot_settings.TAGS_ARE_REQUIRED:
+            subject_re = re.compile(r'^\[([^]]+)\](.*)$')
+        else:
+            subject_re = re.compile(r'^(?:\[([^]]+)\])?(.*)$')
         match = subject_re.match(raw_subject)
         if match:
             #make raw tags comma-separated
-            tagnames = match.group(1).replace(';',',')
+            if match.group(1) is None:#no tags
+                self.cleaned_data['tagnames'] = ''
+            else:
+                tagnames = match.group(1).replace(';',',')
 
-            #pre-process tags
-            tag_list = [tag.strip() for tag in tagnames.split(',')]
-            tag_list = [re.sub(r'\s+', ' ', tag) for tag in tag_list]
-            if askbot_settings.REPLACE_SPACE_WITH_DASH_IN_EMAILED_TAGS:
-                tag_list = [tag.replace(' ', '-') for tag in tag_list]
-            tagnames = ' '.join(tag_list)#todo: use tag separator char here
+                #pre-process tags
+                tag_list = [tag.strip() for tag in tagnames.split(',')]
+                tag_list = [re.sub(r'\s+', ' ', tag) for tag in tag_list]
+                if askbot_settings.REPLACE_SPACE_WITH_DASH_IN_EMAILED_TAGS:
+                    tag_list = [tag.replace(' ', '-') for tag in tag_list]
+                tagnames = ' '.join(tag_list)#todo: use tag separator char here
 
-            #clean tags - may raise ValidationError
-            self.cleaned_data['tagnames'] = TagNamesField().clean(tagnames)
+                #clean tags - may raise ValidationError
+                self.cleaned_data['tagnames'] = TagNamesField().clean(tagnames)
 
             #clean title - may raise ValidationError
             title = match.group(2).strip()