Merge pull request #1836 from eileenmcnaughton/CRM-13632

[civicrm-core.git] / CRM / Mailing / Page / Browse.php

diff --git a/CRM/Mailing/Page/Browse.php b/CRM/Mailing/Page/Browse.php
index afeee905fef2a2cec48a149f37f9e138548b4164..b32cad685c7dea6de3f8ca746671086ae95188ba 100644 (file)
--- a/CRM/Mailing/Page/Browse.php
+++ b/CRM/Mailing/Page/Browse.php
@@ -2,7 +2,7 @@
 
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -128,11 +128,13 @@ class CRM_Mailing_Page_Browse extends CRM_Core_Page {
     $this->preProcess();
 
     $newArgs = func_get_args();
+    // since we want only first function argument
+    $newArgs = $newArgs[0];
     if (isset($_GET['runJobs']) || CRM_Utils_Array::value('2', $newArgs) == 'queue') {
       $config = CRM_Core_Config::singleton();
-      CRM_Mailing_BAO_Job::runJobs_pre($config->mailerJobSize);
-      CRM_Mailing_BAO_Job::runJobs();
-      CRM_Mailing_BAO_Job::runJobs_post();
+      CRM_Mailing_BAO_MailingJob::runJobs_pre($config->mailerJobSize);
+      CRM_Mailing_BAO_MailingJob::runJobs();
+      CRM_Mailing_BAO_MailingJob::runJobs_post();
     }
 
     $this->_sortByCharacter =
@@ -174,7 +176,7 @@ class CRM_Mailing_Page_Browse extends CRM_Core_Page {
 
     if ($this->_action & CRM_Core_Action::DISABLE) {
       if (CRM_Utils_Request::retrieve('confirmed', 'Boolean', $this)) {
-        CRM_Mailing_BAO_Job::cancel($this->_mailingId);
+        CRM_Mailing_BAO_MailingJob::cancel($this->_mailingId);
         CRM_Utils_System::redirect($context);
       }
       else {
@@ -253,43 +255,17 @@ class CRM_Mailing_Page_Browse extends CRM_Core_Page {
       $urlString .= '/unscheduled';
       $urlParams .= '&scheduled=false';
       $this->assign('unscheduled', TRUE);
-
-      if ($this->get('sms')) {
-        CRM_Utils_System::setTitle(ts('Draft and Unscheduled Mass SMS'));
-      }
-      else {
-        CRM_Utils_System::setTitle(ts('Draft and Unscheduled Mailings'));
-      }
     }
     elseif (CRM_Utils_Array::value(3, $newArgs) == 'archived') {
       $urlString .= '/archived';
       $this->assign('archived', TRUE);
-
-      if ($this->get('sms')) {
-        CRM_Utils_System::setTitle(ts('Archived Mass SMS'));
-      }
-      else {
-        CRM_Utils_System::setTitle(ts('Archived Mailings'));
-      }
     }
     elseif (CRM_Utils_Array::value(3, $newArgs) == 'scheduled') {
       $urlString .= '/scheduled';
       $urlParams .= '&scheduled=true';
-
-      if ($this->get('sms')) {
-        CRM_Utils_System::setTitle(ts('Scheduled and Sent Mass SMS'));
-      }
-      else {
-        CRM_Utils_System::setTitle(ts('Scheduled and Sent Mailings'));
-      }
     }
-    else {
-      if ($this->get('sms')) {
-        CRM_Utils_System::setTitle(ts('Find Mass SMS'));
-      }
-      else {
-        CRM_Utils_System::setTitle(ts('Find Mailings'));
-      }
+    if ($this->get('sms')) {
+      CRM_Utils_System::setTitle(ts('Find Mass SMS'));
     }
 
     $crmRowCount = CRM_Utils_Request::retrieve('crmRowCount', 'Integer', CRM_Core_DAO::$_nullObject);