From 4b95f713e8cffea8eee9efe01175b9c1a808be31 Mon Sep 17 00:00:00 2001
From: Dave Greenberg <dave@civicrm.org>
Date: Mon, 1 Dec 2014 14:57:53 -0500
Subject: [PATCH] CRM-15667 - Fix invalid selector column values for
 Unsubscribe Requests.

----------------------------------------
* CRM-15667:
  https://issues.civicrm.org/jira/browse/CRM-15667
---
 CRM/Mailing/Event/BAO/Unsubscribe.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CRM/Mailing/Event/BAO/Unsubscribe.php b/CRM/Mailing/Event/BAO/Unsubscribe.php
index 75724efbc2..d252266132 100644
--- a/CRM/Mailing/Event/BAO/Unsubscribe.php
+++ b/CRM/Mailing/Event/BAO/Unsubscribe.php
@@ -559,7 +559,8 @@ WHERE  email = %2
       $results[] = array(
         'name' => "<a href=\"$url\">{$dao->display_name}</a>",
         'email' => $dao->email,
-        'org' => $dao->org_unsubscribe ? ts('Yes') : ts('No'),
+        // Next value displays in selector under either Unsubscribe OR Optout column header, so always s/b Yes.
+        'unsubOrOptout' => ts('Yes'),
         'date' => CRM_Utils_Date::customFormat($dao->date),
       );
     }
-- 
2.25.1