projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #4955 from atif-shaikh/master-cleanup
[civicrm-core.git]
/
CRM
/
Mailing
/
Form
/
Approve.php
diff --git
a/CRM/Mailing/Form/Approve.php
b/CRM/Mailing/Form/Approve.php
index aeb1633d4963462b98dc9bd4b54b8b42efe62076..3477152a076cc271c752f79dd080f61853c354f9 100644
(file)
--- a/
CRM/Mailing/Form/Approve.php
+++ b/
CRM/Mailing/Form/Approve.php
@@
-58,7
+58,6
@@
class CRM_Mailing_Form_Approve extends CRM_Core_Form {
$this->redirectToListing();
}
$this->redirectToListing();
}
-
// when user come from search context.
$this->_searchBasedMailing = CRM_Contact_Form_Search::isSearchContext($this->get('context'));
// when user come from search context.
$this->_searchBasedMailing = CRM_Contact_Form_Search::isSearchContext($this->get('context'));
@@
-123,7
+122,8
@@
class CRM_Mailing_Form_Approve extends CRM_Core_Form {
$this->addRadio('approval_status_id', ts('Approval Status'), $mailApprovalStatus, TRUE, NULL, TRUE);
$buttons = array(
$this->addRadio('approval_status_id', ts('Approval Status'), $mailApprovalStatus, TRUE, NULL, TRUE);
$buttons = array(
- array('type' => 'next',
+ array(
+ 'type' => 'next',
'name' => ts('Save'),
'spacing' => ' ',
'isDefault' => TRUE,
'name' => ts('Save'),
'spacing' => ' ',
'isDefault' => TRUE,
@@
-208,7
+208,6
@@
class CRM_Mailing_Form_Approve extends CRM_Core_Form {
CRM_Mailing_BAO_Mailing::create($params, $ids);
CRM_Mailing_BAO_Mailing::create($params, $ids);
-
//when user perform mailing from search context
//redirect it to search result CRM-3711
$ssID = $this->get('ssID');
//when user perform mailing from search context
//redirect it to search result CRM-3711
$ssID = $this->get('ssID');
@@
-241,8
+240,8
@@
class CRM_Mailing_Form_Approve extends CRM_Core_Form {
$session = CRM_Core_Session::singleton();
$session->pushUserContext(CRM_Utils_System::url('civicrm/mailing/browse/scheduled',
$session = CRM_Core_Session::singleton();
$session->pushUserContext(CRM_Utils_System::url('civicrm/mailing/browse/scheduled',
-
'reset=1&scheduled=true'
-
));
+ 'reset=1&scheduled=true'
+ ));
}
/**
}
/**