From 7f38cf7fa3d8d8f1a47e8c51fcb9d36d5d15143b Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Tue, 21 May 2019 16:08:32 +1000 Subject: [PATCH] Update Language to be more user friendly when checking logs --- CRM/Core/BAO/ActionSchedule.php | 2 +- tests/phpunit/api/v3/JobTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Core/BAO/ActionSchedule.php b/CRM/Core/BAO/ActionSchedule.php index c2709a5296..ba2130a493 100644 --- a/CRM/Core/BAO/ActionSchedule.php +++ b/CRM/Core/BAO/ActionSchedule.php @@ -549,7 +549,7 @@ FROM civicrm_action_schedule cas // dev/core#369 If an SMS provider is deleted then the relevant row in the action_schedule_table is set to NULL // So we need to exclude them. if (CRM_Utils_System::isNull($schedule->sms_provider_id)) { - return ["sms_provider_missing" => "SMS Provider is NULL in database cannot send reminder"]; + return ["sms_provider_missing" => "SMS reminder cannot be sent because the SMS provider has been deleted."]; } $messageSubject = $tokenRow->render('subject'); diff --git a/tests/phpunit/api/v3/JobTest.php b/tests/phpunit/api/v3/JobTest.php index 35f3ad1545..8e3f32b5e9 100644 --- a/tests/phpunit/api/v3/JobTest.php +++ b/tests/phpunit/api/v3/JobTest.php @@ -412,7 +412,7 @@ class api_v3_JobTest extends CiviUnitTestCase { $this->assertEquals($sentToID, $theChosenOneID); $cronlog = CRM_Core_DAO::executeQuery("SELECT * FROM civicrm_action_log")->fetchAll()[0]; $this->assertEquals(1, $cronlog['is_error']); - $this->assertEquals('SMS Provider is NULL in database cannot send reminder', $cronlog['message']); + $this->assertEquals('SMS reminder cannot be sent because the SMS provider has been deleted.', $cronlog['message']); $this->setupForSmsTests(TRUE); } -- 2.25.1