bugfixes: 1) global subscribers get emails even if frequency is zero; 2) if subscribed tag set is enabled users wont get emails on tag subscription; 3) if email is read-only email is lost upon editing user profile; 4) in some browsers there is horizontal scroll in the post body, which should not be there

1 files changed, 9 insertions, 1 deletions

diff --git a/askbot/conf/__init__.py b/askbot/conf/__init__.py
index 3e80877c..fd62bc88 100644
--- a/askbot/conf/__init__.py
+++ b/askbot/conf/__init__.py
@@ -1,4 +1,5 @@
 #import these to compile code and install values
+from askbot import const
 import askbot
 import askbot.conf.minimum_reputation
 import askbot.conf.vote_rules
@@ -38,9 +39,16 @@ def should_show_sort_by_relevance():
     return ('postgresql_psycopg2' in askbot.get_database_engine_name())
 
 def get_tag_display_filter_strategy_choices():
-    from askbot import const
     from askbot.conf import settings as askbot_settings
     if askbot_settings.SUBSCRIBED_TAG_SELECTOR_ENABLED:
         return const.TAG_DISPLAY_FILTER_STRATEGY_CHOICES
     else:
         return const.TAG_DISPLAY_FILTER_STRATEGY_MINIMAL_CHOICES
+
+def get_tag_email_filter_strategy_choices():
+    """returns the set of choices appropriate for the configuration"""
+    from askbot.conf import settings as askbot_settings
+    if askbot_settings.SUBSCRIBED_TAG_SELECTOR_ENABLED:
+        return const.TAG_EMAIL_FILTER_ADVANCED_STRATEGY_CHOICES
+    else:
+        return const.TAG_EMAIL_FILTER_SIMPLE_STRATEGY_CHOICES