From 8ca4ca1400a3c9b3bede91ceb4aac14c5eecf86e Mon Sep 17 00:00:00 2001
From: Puneeth Chaganti <punchagan@muse-amuse.in>
Date: Sun, 3 Mar 2019 09:42:11 +0530
Subject: [PATCH] digest: Don't update context with data already in common
 context.

---
 templates/zerver/emails/digest.source.html | 2 +-
 templates/zerver/emails/digest.txt         | 2 +-
 version.py                                 | 2 +-
 zerver/lib/digest.py                       | 2 --
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/templates/zerver/emails/digest.source.html b/templates/zerver/emails/digest.source.html
index 97ee45a3f0..fa30030939 100644
--- a/templates/zerver/emails/digest.source.html
+++ b/templates/zerver/emails/digest.source.html
@@ -1,7 +1,7 @@
 {% extends "zerver/emails/email_base_messages.html" %}
 
 {% block content %}
-    <p>Hello {{ name }},</p>
+    <p>Hello {{ user_name }},</p>
 
     <p>A lot has happened on Zulip while you've been away! <a href="{{ realm_uri }}">Visit Zulip</a> to catch up.</p>
 
diff --git a/templates/zerver/emails/digest.txt b/templates/zerver/emails/digest.txt
index 46a9737097..46d45904a0 100644
--- a/templates/zerver/emails/digest.txt
+++ b/templates/zerver/emails/digest.txt
@@ -1,4 +1,4 @@
-Hello {{ name }},
+Hello {{ user_name }},
 
 A lot has happened on Zulip while you've been away! Visit
 {{ realm_uri }} to catch up.
diff --git a/version.py b/version.py
index f0ac8c5f31..6f7a90883b 100644
--- a/version.py
+++ b/version.py
@@ -11,4 +11,4 @@ LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2019/03/01/zulip-2-0-relea
 # Typically, adding a dependency only requires a minor version bump, and
 # removing a dependency requires a major version bump.
 
-PROVISION_VERSION = '28.8'
+PROVISION_VERSION = '28.9'
diff --git a/zerver/lib/digest.py b/zerver/lib/digest.py
index 6053a00ed7..0c36b6738f 100644
--- a/zerver/lib/digest.py
+++ b/zerver/lib/digest.py
@@ -213,8 +213,6 @@ def handle_digest_email(user_profile_id: int, cutoff: float,
 
     # Start building email template data.
     context.update({
-        'realm_name': user_profile.realm.name,
-        'name': user_profile.full_name,
         'unsubscribe_link': one_click_unsubscribe_link(user_profile, "digest")
     })