From f83f635214c0304f2808688af5047c02324b4c00 Mon Sep 17 00:00:00 2001
From: Dave Greenberg <dave@civicrm.org>
Date: Tue, 6 May 2014 11:33:50 -0400
Subject: [PATCH] CRM-14367 - Prevent notice by adding display_name to
 $returnProperties. Also remove unintentionally committed debug line in
 CRM/Mailing/Form/Settings.php

----------------------------------------
* CRM-14367:
  https://issues.civicrm.org/jira/browse/CRM-14367
---
 CRM/Contribute/Form/Task/PDFLetterCommon.php | 2 ++
 CRM/Mailing/Form/Settings.php                | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CRM/Contribute/Form/Task/PDFLetterCommon.php b/CRM/Contribute/Form/Task/PDFLetterCommon.php
index a020f1bb8a..144b2a18e4 100644
--- a/CRM/Contribute/Form/Task/PDFLetterCommon.php
+++ b/CRM/Contribute/Form/Task/PDFLetterCommon.php
@@ -24,6 +24,8 @@ class CRM_Contribute_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDF
       $emailParams = array(
         'subject'   => $formValues['subject']
       );
+      // We need display_name for emailLetter() so add to returnProperties here
+      $returnProperties['display_name'] = 1;
       if(stristr($formValues['email_options'], 'pdfemail')) {
         $isPDF = TRUE;
       }
diff --git a/CRM/Mailing/Form/Settings.php b/CRM/Mailing/Form/Settings.php
index ed19a00bea..15b58f1742 100644
--- a/CRM/Mailing/Form/Settings.php
+++ b/CRM/Mailing/Form/Settings.php
@@ -91,10 +91,6 @@ class CRM_Mailing_Form_Settings extends CRM_Core_Form {
       $dao->override_verp = !$dao->override_verp;
       $dao->storeValues($dao, $defaults);
       $defaults['visibility'] = $dao->visibility;
-      
-      crm_core_error::debug('$dao->visibility', $dao->visibility);
-      exit();
-      
     }
     return $defaults;
   }
-- 
2.25.1