From 9e6a2a3beacb9de0bb4a408b71dd9e89878a6531 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Sat, 25 Jan 2014 13:10:38 +0100
Subject: [PATCH] [FIX] Do not treat disabled notification as error

Fixes #1582 once merged.
---
 cronjobs/payouts.php                          | 2 +-
 public/include/classes/notification.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cronjobs/payouts.php b/cronjobs/payouts.php
index 87b5e119..0b01e1e6 100755
--- a/cronjobs/payouts.php
+++ b/cronjobs/payouts.php
@@ -82,7 +82,7 @@ if ($setting->getValue('disable_manual_payouts') != 1) {
           $aMailData['amount'] = $dBalance - $config['txfee_manual'];
           $aMailData['payout_id'] = $aData['id'];
           if (!$notification->sendNotification($aData['account_id'], 'manual_payout', $aMailData))
-            $log->logError('Failed to send notification email to users address: ' . $aMailData['email']);
+            $log->logError('Failed to send notification email to users address ' . $aMailData['email'] . ' : ' . $notification->getCronError);
           // Recheck the users balance to make sure it is now 0
           $aBalance = $transaction->getBalance($aData['account_id']);
           if ($aBalance['confirmed'] > 0) {
diff --git a/public/include/classes/notification.class.php b/public/include/classes/notification.class.php
index 3db6acf8..dd467634 100644
--- a/public/include/classes/notification.class.php
+++ b/public/include/classes/notification.class.php
@@ -148,7 +148,7 @@ class Notification extends Mail {
       }
     } else {
       $this->setErrorMessage('User disabled ' . $strType . ' notifications');
-      return false;
+      return true;
     }
     $this->setErrorMessage('Error sending mail notification');
     return false;