From 3f8fb00c244db32bbcef6a9b7ab63af80076f4f3 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 31 Aug 2022 12:16:19 -0400
Subject: [PATCH] Deprecate preferred_mail_format column

---
 CRM/Contact/DAO/Contact.php    | 7 ++++---
 xml/schema/Contact/Contact.xml | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CRM/Contact/DAO/Contact.php b/CRM/Contact/DAO/Contact.php
index ec0f6bcf33..bda098f293 100644
--- a/CRM/Contact/DAO/Contact.php
+++ b/CRM/Contact/DAO/Contact.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/Contact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3a5849bd17dab3559b6002ffd18ea0b7)
+ * (GenCodeChecksum:be4fd5a55e44b4770bd3fcdebd2c26a5)
  */
 
 /**
@@ -209,11 +209,12 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO {
   public $preferred_language;
 
   /**
-   * What is the preferred mode of sending an email.
+   * Deprecated setting for text vs html mailings
    *
    * @var string|null
    *   (SQL type: varchar(8))
    *   Note that values will be retrieved from the database as a string.
+   * @deprecated
    */
   public $preferred_mail_format;
 
@@ -959,7 +960,7 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO {
           'name' => 'preferred_mail_format',
           'type' => CRM_Utils_Type::T_STRING,
           'title' => ts('Preferred Mail Format'),
-          'description' => ts('What is the preferred mode of sending an email.'),
+          'description' => ts('Deprecated setting for text vs html mailings'),
           'maxlength' => 8,
           'size' => CRM_Utils_Type::EIGHT,
           'import' => FALSE,
diff --git a/xml/schema/Contact/Contact.xml b/xml/schema/Contact/Contact.xml
index eadfeaeb6c..66d553c279 100644
--- a/xml/schema/Contact/Contact.xml
+++ b/xml/schema/Contact/Contact.xml
@@ -335,7 +335,7 @@
     <default>"Both"</default>
     <import>false</import>
     <headerPattern>/^p(ref\w*\s)?m(ail\s)?f(orm\w*)$/i</headerPattern>
-    <comment>What is the preferred mode of sending an email.</comment>
+    <comment>Deprecated setting for text vs html mailings</comment>
     <add>1.1</add>
     <pseudoconstant>
       <callback>CRM_Core_SelectValues::pmf</callback>
@@ -344,6 +344,7 @@
       <type>Select</type>
       <label>Preferred Mail Format</label>
     </html>
+    <deprecated>true</deprecated>
   </field>
   <field>
     <name>hash</name>
-- 
2.25.1