From 0ad8a63ee3e31283d7241207b45ab67fe8cd9516 Mon Sep 17 00:00:00 2001
From: esteele <eric@esteele.net>
Date: Thu, 10 Sep 2015 12:09:30 -0400
Subject: [PATCH] Pull email_from_name value from the registry.

---
 Products/CMFPlone/browser/templates/contact-info-email.pt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Products/CMFPlone/browser/templates/contact-info-email.pt b/Products/CMFPlone/browser/templates/contact-info-email.pt
index 8bcf2ab34c..d15534ac27 100644
--- a/Products/CMFPlone/browser/templates/contact-info-email.pt
+++ b/Products/CMFPlone/browser/templates/contact-info-email.pt
@@ -6,11 +6,12 @@
      tal:omit-tag=""
      tal:define="portal context/@@plone_portal_state/portal;
                  charset portal/email_charset|string:utf-8;
+                 from_name python:context.portal_registry['plone.email_from_name'];
                  dummy python:request.RESPONSE.setHeader('Content-Type', 'text/plain;;charset=%s' % charset);"
 ><span tal:omit-tag="" tal:content="options/message | nothing" />
 
 --
-<span tal:replace="portal/email_from_name" />
+<span tal:replace="from_name" />
 
 <div i18n:translate="site_feedback_mailtemplate_body" tal:omit-tag="">
 You are receiving this mail because <span i18n:name="fullname" tal:omit-tag="" tal:content="options/sender_fullname|nothing" />