diff --git a/templates/zerver/emails/email_base_messages.html b/templates/zerver/emails/email_base_messages.html index 8e2f4c9b66..ac1a323ccb 100644 --- a/templates/zerver/emails/email_base_messages.html +++ b/templates/zerver/emails/email_base_messages.html @@ -4,6 +4,7 @@ Zulip + {% if has_preheader %} {% block preheader %}{% endblock %} + {% endif %} {% block content %}{% endblock %} {% block manage_preferences %}{% endblock %} diff --git a/version.py b/version.py index a841ec3974..917b8ea611 100644 --- a/version.py +++ b/version.py @@ -26,4 +26,4 @@ LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2019/03/01/zulip-2-0-relea # historical commits sharing the same major version, in which case a # minor version bump suffices. -PROVISION_VERSION = '49.0' +PROVISION_VERSION = '49.1' diff --git a/zerver/lib/digest.py b/zerver/lib/digest.py index b545cadccd..830cccbd5e 100644 --- a/zerver/lib/digest.py +++ b/zerver/lib/digest.py @@ -202,6 +202,8 @@ def handle_digest_email(user_profile_id: int, cutoff: float, context["new_streams"] = new_streams context["new_streams_count"] = new_streams_count + # TODO: Set has_preheader if we want to include a preheader. + if render_to_web: return context