CRM-19690 - Enable FlexMailer (if present) - Fixup for v4.6

civicrm · Jan 5, 2017 · c043e33 · c043e33
1 parent 011b368
commit c043e33
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CRM/Mailing/BAO/MailingJob.php b/CRM/Mailing/BAO/MailingJob.php
@@ -488,7 +488,7 @@ public function queue($testParams = NULL) {
    * @return void
    */
   public function deliver(&$mailer, $testParams = NULL) {
-    if (\Civi::settings()->get('experimentalFlexMailerEngine')) {
+    if (CRM_Core_BAO_Setting::getItem('Mailing Preferences', 'experimentalFlexMailerEngine')) {
       throw new \RuntimeException("Cannot use legacy deliver() when experimentalFlexMailerEngine is enabled");
     }