Merge pull request #18907 from alifrumin/2139

[civicrm-core.git] / CRM / Contact / Form / Task / Unhold.php

diff --git a/CRM/Contact/Form/Task/Unhold.php b/CRM/Contact/Form/Task/Unhold.php
index e9ee12d71130ba8bd4431cff2dd6bf8a2ac660fb..add289176475127bd7c3b18b38ca6cef7b060ac4 100644 (file)
--- a/CRM/Contact/Form/Task/Unhold.php
+++ b/CRM/Contact/Form/Task/Unhold.php
@@ -23,20 +23,19 @@ class CRM_Contact_Form_Task_Unhold extends CRM_Contact_Form_Task {
       $queryString = "
 UPDATE civicrm_email SET on_hold = 0, hold_date = null
 WHERE on_hold = 1 AND hold_date is not null AND contact_id in (" . implode(",", $this->_contactIds) . ")";
-      CRM_Core_DAO::executeQuery($queryString);
-      $sql = "SELECT ROW_COUNT( )";
-      $result = CRM_Core_DAO::singleValueQuery($sql);
-      if ($result) {
-        CRM_Core_Session::setStatus(ts('%count email was found on hold and updated.', array(
-              'count' => $result,
-              'plural' => '%count emails were found on hold and updated.',
-            )), ts('Emails Restored'), 'success');
+      $result = CRM_Core_DAO::executeQuery($queryString);
+      $rowCount = $result->affectedRows();
+
+      if ($rowCount) {
+        CRM_Core_Session::setStatus(ts('%count email was found on hold and updated.', [
+          'count' => $rowCount,
+          'plural' => '%count emails were found on hold and updated.',
+        ]), ts('Emails Restored'), 'success');
       }
       else {
-        CRM_Core_Session::setStatus(ts('The selected contact does not have an email on hold.', array(
-              'count' => $result,
-              'plural' => 'None of the selected contacts have an email on hold.',
-            )), ts('No Emails to Restore'), 'info');
+        CRM_Core_Session::setStatus(ts('The selected contact does not have an email on hold.', [
+          'plural' => 'None of the selected contacts have an email on hold.',
+        ]), ts('No Emails to Restore'), 'info');
       }
     }
     else {