projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-11-11-10-44-51
[civicrm-core.git]
/
CRM
/
Mailing
/
Page
/
Browse.php
diff --git
a/CRM/Mailing/Page/Browse.php
b/CRM/Mailing/Page/Browse.php
index 3ea830fc4088d89a9fcdd19fdbad30a6558be633..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 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
@@
-132,9
+132,9
@@
class CRM_Mailing_Page_Browse extends CRM_Core_Page {
$newArgs = $newArgs[0];
if (isset($_GET['runJobs']) || CRM_Utils_Array::value('2', $newArgs) == 'queue') {
$config = CRM_Core_Config::singleton();
$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_
Mailing
Job::runJobs_pre($config->mailerJobSize);
+ CRM_Mailing_BAO_
Mailing
Job::runJobs();
+ CRM_Mailing_BAO_
Mailing
Job::runJobs_post();
}
$this->_sortByCharacter =
}
$this->_sortByCharacter =
@@
-176,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)) {
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_
Mailing
Job::cancel($this->_mailingId);
CRM_Utils_System::redirect($context);
}
else {
CRM_Utils_System::redirect($context);
}
else {
@@
-255,43
+255,17
@@
class CRM_Mailing_Page_Browse extends CRM_Core_Page {
$urlString .= '/unscheduled';
$urlParams .= '&scheduled=false';
$this->assign('unscheduled', TRUE);
$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);
}
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';
}
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);
}
$crmRowCount = CRM_Utils_Request::retrieve('crmRowCount', 'Integer', CRM_Core_DAO::$_nullObject);