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 #3804 from atif-shaikh/CRM-15087
[civicrm-core.git]
/
CRM
/
Campaign
/
StateMachine
/
Search.php
diff --git
a/CRM/Campaign/StateMachine/Search.php
b/CRM/Campaign/StateMachine/Search.php
index 180c06e13c1c0245677e91aab77b517548947d7e..180f984151bff8d4686521c5b55293a674909732 100755
(executable)
--- a/
CRM/Campaign/StateMachine/Search.php
+++ b/
CRM/Campaign/StateMachine/Search.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
4
|
+ | CiviCRM version 4.
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
3
|
+ | Copyright CiviCRM LLC (c) 2004-201
4
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
3
+ * @copyright CiviCRM LLC (c) 2004-201
4
* $Id$
*
*/
* $Id$
*
*/
@@
-74,18
+74,14
@@
class CRM_Campaign_StateMachine_Search extends CRM_Core_StateMachine {
*
* @param CRM_Core_Controller $controller the controller object
*
*
* @param CRM_Core_Controller $controller the controller object
*
+ * @param string $formName
+ *
* @return string the name of the form that will handle the task
* @access protected
*/
function taskName($controller, $formName = 'Search') {
// total hack, check POST vars and then session to determine stuff
* @return string the name of the form that will handle the task
* @access protected
*/
function taskName($controller, $formName = 'Search') {
// total hack, check POST vars and then session to determine stuff
- // fix value if print button is pressed
- if (CRM_Utils_Array::value('_qf_' . $formName . '_next_print', $_POST)) {
- $value = CRM_Campaign_Task::PRINT_VOTERS;
- }
- else {
- $value = CRM_Utils_Array::value('task', $_POST);
- }
+ $value = CRM_Utils_Array::value('task', $_POST);
if (!isset($value)) {
$value = $this->_controller->get('task');
}
if (!isset($value)) {
$value = $this->_controller->get('task');
}