From 916f11f81230ca6ed54c96c94ce1becf197bb955 Mon Sep 17 00:00:00 2001
From: lyyana <yliao@oxfam.de>
Date: Wed, 14 Mar 2018 13:18:29 +0100
Subject: [PATCH] Update Email.php

---
 CRM/Core/BAO/Email.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CRM/Core/BAO/Email.php b/CRM/Core/BAO/Email.php
index 6c0f07f4bc..e1370ca433 100644
--- a/CRM/Core/BAO/Email.php
+++ b/CRM/Core/BAO/Email.php
@@ -237,7 +237,9 @@ ORDER BY e.is_primary DESC, email_id ASC ";
    *   Email object.
    */
   public static function holdEmail(&$email) {
-    $email->on_hold = intval($email->on_hold);
+    if (!($email->on_hold === 'null' || $email->on_hold === NULL)) {
+      $email->on_hold = intval($email->on_hold);
+    }
     //check for update mode
     if ($email->id) {
       $params = array(1 => array($email->id, 'Integer'));
-- 
2.25.1