From 3cf140d0acbcb393db346fc60d991dd449b42248 Mon Sep 17 00:00:00 2001 From: Sandor Semsey Date: Mon, 29 May 2023 11:14:49 +0200 Subject: [PATCH] CRM_Core_StateMachine::addSequentialPages(): don't pass extra action parameter --- CRM/Activity/StateMachine/Search.php | 2 +- CRM/Campaign/StateMachine/Search.php | 2 +- CRM/Case/StateMachine/Search.php | 2 +- CRM/Contact/StateMachine/Search.php | 2 +- CRM/Contribute/StateMachine/Contribution.php | 2 +- CRM/Contribute/StateMachine/ContributionPage.php | 2 +- CRM/Contribute/StateMachine/Search.php | 2 +- CRM/Core/Controller/Simple.php | 2 +- CRM/Event/StateMachine/Registration.php | 2 +- CRM/Event/StateMachine/Search.php | 2 +- CRM/Export/StateMachine/Standalone.php | 2 +- CRM/Group/StateMachine.php | 2 +- CRM/Import/StateMachine.php | 2 +- CRM/Member/StateMachine/Search.php | 2 +- CRM/PCP/StateMachine/PCP.php | 2 +- CRM/Pledge/StateMachine/Search.php | 2 +- CRM/SMS/StateMachine/Send.php | 2 +- CRM/Upgrade/StateMachine.php | 2 +- ext/civigrant/CRM/Grant/StateMachine/Search.php | 2 +- ext/eventcart/CRM/Event/Cart/StateMachine/Checkout.php | 2 +- .../CRM/Legacycustomsearches/StateMachine/Search.php | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CRM/Activity/StateMachine/Search.php b/CRM/Activity/StateMachine/Search.php index 6e08eb9861..8925aa308b 100644 --- a/CRM/Activity/StateMachine/Search.php +++ b/CRM/Activity/StateMachine/Search.php @@ -41,7 +41,7 @@ class CRM_Activity_StateMachine_Search extends CRM_Core_StateMachine { $this->_pages[$t] = NULL; } - $this->addSequentialPages($this->_pages, $action); + $this->addSequentialPages($this->_pages); } /** diff --git a/CRM/Campaign/StateMachine/Search.php b/CRM/Campaign/StateMachine/Search.php index f69e472968..af20279448 100644 --- a/CRM/Campaign/StateMachine/Search.php +++ b/CRM/Campaign/StateMachine/Search.php @@ -49,7 +49,7 @@ class CRM_Campaign_StateMachine_Search extends CRM_Core_StateMachine { $this->_pages['CRM_Campaign_Form_Task_Result'] = NULL; } - $this->addSequentialPages($this->_pages, $action); + $this->addSequentialPages($this->_pages); } /** diff --git a/CRM/Case/StateMachine/Search.php b/CRM/Case/StateMachine/Search.php index a89c2c6a36..4a87ed3fb7 100644 --- a/CRM/Case/StateMachine/Search.php +++ b/CRM/Case/StateMachine/Search.php @@ -51,7 +51,7 @@ class CRM_Case_StateMachine_Search extends CRM_Core_StateMachine { $this->_pages['CRM_Case_Form_Task_Result'] = NULL; } - $this->addSequentialPages($this->_pages, $action); + $this->addSequentialPages($this->_pages); } /** diff --git a/CRM/Contact/StateMachine/Search.php b/CRM/Contact/StateMachine/Search.php index 5d952a0a13..1a2a585bf3 100644 --- a/CRM/Contact/StateMachine/Search.php +++ b/CRM/Contact/StateMachine/Search.php @@ -64,7 +64,7 @@ class CRM_Contact_StateMachine_Search extends CRM_Core_StateMachine { $this->_pages['CRM_Contact_Form_Task_Result'] = NULL; } - $this->addSequentialPages($this->_pages, $action); + $this->addSequentialPages($this->_pages); } /** diff --git a/CRM/Contribute/StateMachine/Contribution.php b/CRM/Contribute/StateMachine/Contribution.php index 60cbb4d6c8..b35441b78c 100644 --- a/CRM/Contribute/StateMachine/Contribution.php +++ b/CRM/Contribute/StateMachine/Contribution.php @@ -38,7 +38,7 @@ class CRM_Contribute_StateMachine_Contribution extends CRM_Core_StateMachine { 'CRM_Contribute_Form_Contribution_ThankYou' => NULL, ]; - $this->addSequentialPages($this->_pages, $action); + $this->addSequentialPages($this->_pages); } } diff --git a/CRM/Contribute/StateMachine/ContributionPage.php b/CRM/Contribute/StateMachine/ContributionPage.php index e3d74b899d..f9664580de 100644 --- a/CRM/Contribute/StateMachine/ContributionPage.php +++ b/CRM/Contribute/StateMachine/ContributionPage.php @@ -50,7 +50,7 @@ class CRM_Contribute_StateMachine_ContributionPage extends CRM_Core_StateMachine unset($this->_pages['CRM_Member_Form_MembershipBlock']); } - $this->addSequentialPages($this->_pages, $action); + $this->addSequentialPages($this->_pages); } } diff --git a/CRM/Contribute/StateMachine/Search.php b/CRM/Contribute/StateMachine/Search.php index 86b60a97e0..624b223df7 100644 --- a/CRM/Contribute/StateMachine/Search.php +++ b/CRM/Contribute/StateMachine/Search.php @@ -49,7 +49,7 @@ class CRM_Contribute_StateMachine_Search extends CRM_Core_StateMachine { if ($result) { $this->_pages['CRM_Contribute_Form_Task_Result'] = NULL; } - $this->addSequentialPages($this->_pages, $action); + $this->addSequentialPages($this->_pages); } /** diff --git a/CRM/Core/Controller/Simple.php b/CRM/Core/Controller/Simple.php index d88929e666..1f13aa035b 100644 --- a/CRM/Core/Controller/Simple.php +++ b/CRM/Core/Controller/Simple.php @@ -59,7 +59,7 @@ class CRM_Core_Controller_Simple extends CRM_Core_Controller { $mode = $savedAction; } - $this->_stateMachine->addSequentialPages($params, $mode); + $this->_stateMachine->addSequentialPages($params); $this->addPages($this->_stateMachine, $mode); diff --git a/CRM/Event/StateMachine/Registration.php b/CRM/Event/StateMachine/Registration.php index e70a4bc8ef..1f9be3357a 100644 --- a/CRM/Event/StateMachine/Registration.php +++ b/CRM/Event/StateMachine/Registration.php @@ -70,7 +70,7 @@ class CRM_Event_StateMachine_Registration extends CRM_Core_StateMachine { unset($pages['CRM_Event_Form_Registration_Confirm']); } - $this->addSequentialPages($pages, $action); + $this->addSequentialPages($pages); } } diff --git a/CRM/Event/StateMachine/Search.php b/CRM/Event/StateMachine/Search.php index f235ac4026..0029becacc 100644 --- a/CRM/Event/StateMachine/Search.php +++ b/CRM/Event/StateMachine/Search.php @@ -49,7 +49,7 @@ class CRM_Event_StateMachine_Search extends CRM_Core_StateMachine { $this->_pages['CRM_Event_Form_Task_Result'] = NULL; } - $this->addSequentialPages($this->_pages, $action); + $this->addSequentialPages($this->_pages); } /** diff --git a/CRM/Export/StateMachine/Standalone.php b/CRM/Export/StateMachine/Standalone.php index 99d58647ad..2f8662a416 100644 --- a/CRM/Export/StateMachine/Standalone.php +++ b/CRM/Export/StateMachine/Standalone.php @@ -33,7 +33,7 @@ class CRM_Export_StateMachine_Standalone extends CRM_Core_StateMachine { 'CRM_' . $entity . '_Export_Form_Map' => NULL, ]; - $this->addSequentialPages($this->_pages, $action); + $this->addSequentialPages($this->_pages); } /** diff --git a/CRM/Group/StateMachine.php b/CRM/Group/StateMachine.php index 2895be5b28..ae6287237d 100644 --- a/CRM/Group/StateMachine.php +++ b/CRM/Group/StateMachine.php @@ -32,7 +32,7 @@ class CRM_Group_StateMachine extends CRM_Core_StateMachine { 'CRM_Contact_Form_Task_Result' => NULL, ]; - $this->addSequentialPages($this->_pages, $action); + $this->addSequentialPages($this->_pages); } /** diff --git a/CRM/Import/StateMachine.php b/CRM/Import/StateMachine.php index 4a06c6f91b..ddc69485b8 100644 --- a/CRM/Import/StateMachine.php +++ b/CRM/Import/StateMachine.php @@ -36,7 +36,7 @@ class CRM_Import_StateMachine extends CRM_Core_StateMachine { $classType . '_Form_Preview' => NULL, ]; - $this->addSequentialPages($this->_pages, $action); + $this->addSequentialPages($this->_pages); } } diff --git a/CRM/Member/StateMachine/Search.php b/CRM/Member/StateMachine/Search.php index dc05d7f435..7caaccd15c 100644 --- a/CRM/Member/StateMachine/Search.php +++ b/CRM/Member/StateMachine/Search.php @@ -49,7 +49,7 @@ class CRM_Member_StateMachine_Search extends CRM_Core_StateMachine { if ($result) { $this->_pages['CRM_Member_Form_Task_Result'] = NULL; } - $this->addSequentialPages($this->_pages, $action); + $this->addSequentialPages($this->_pages); } /** diff --git a/CRM/PCP/StateMachine/PCP.php b/CRM/PCP/StateMachine/PCP.php index d3b6ba9630..1949f92289 100644 --- a/CRM/PCP/StateMachine/PCP.php +++ b/CRM/PCP/StateMachine/PCP.php @@ -41,7 +41,7 @@ class CRM_PCP_StateMachine_PCP extends CRM_Core_StateMachine { 'CRM_PCP_Form_Campaign' => NULL, ]; - $this->addSequentialPages($this->_pages, $action); + $this->addSequentialPages($this->_pages); } } diff --git a/CRM/Pledge/StateMachine/Search.php b/CRM/Pledge/StateMachine/Search.php index b47ba015f9..084e342293 100644 --- a/CRM/Pledge/StateMachine/Search.php +++ b/CRM/Pledge/StateMachine/Search.php @@ -51,7 +51,7 @@ class CRM_Pledge_StateMachine_Search extends CRM_Core_StateMachine { $this->_pages['CRM_Pledge_Form_Task_Result'] = NULL; } - $this->addSequentialPages($this->_pages, $action); + $this->addSequentialPages($this->_pages); } /** diff --git a/CRM/SMS/StateMachine/Send.php b/CRM/SMS/StateMachine/Send.php index f5a9f1a419..7ba3dfc6df 100644 --- a/CRM/SMS/StateMachine/Send.php +++ b/CRM/SMS/StateMachine/Send.php @@ -37,7 +37,7 @@ class CRM_SMS_StateMachine_Send extends CRM_Core_StateMachine { 'CRM_SMS_Form_Schedule' => NULL, ]; - $this->addSequentialPages($this->_pages, $action); + $this->addSequentialPages($this->_pages); } } diff --git a/CRM/Upgrade/StateMachine.php b/CRM/Upgrade/StateMachine.php index c149c1c070..cb75227fa0 100644 --- a/CRM/Upgrade/StateMachine.php +++ b/CRM/Upgrade/StateMachine.php @@ -34,7 +34,7 @@ class CRM_Upgrade_StateMachine extends CRM_Core_StateMachine { $this->_pages = &$pages; - $this->addSequentialPages($this->_pages, $action); + $this->addSequentialPages($this->_pages); } } diff --git a/ext/civigrant/CRM/Grant/StateMachine/Search.php b/ext/civigrant/CRM/Grant/StateMachine/Search.php index 1fec37f322..9aed2fa42c 100644 --- a/ext/civigrant/CRM/Grant/StateMachine/Search.php +++ b/ext/civigrant/CRM/Grant/StateMachine/Search.php @@ -51,7 +51,7 @@ class CRM_Grant_StateMachine_Search extends CRM_Core_StateMachine { $this->_pages['CRM_Grant_Form_Task_Result'] = NULL; } - $this->addSequentialPages($this->_pages, $action); + $this->addSequentialPages($this->_pages); } /** diff --git a/ext/eventcart/CRM/Event/Cart/StateMachine/Checkout.php b/ext/eventcart/CRM/Event/Cart/StateMachine/Checkout.php index bff2b8adb0..bb705f83fc 100644 --- a/ext/eventcart/CRM/Event/Cart/StateMachine/Checkout.php +++ b/ext/eventcart/CRM/Event/Cart/StateMachine/Checkout.php @@ -32,7 +32,7 @@ class CRM_Event_Cart_StateMachine_Checkout extends CRM_Core_StateMachine { } $pages["CRM_Event_Cart_Form_Checkout_Payment"] = NULL; $pages["CRM_Event_Cart_Form_Checkout_ThankYou"] = NULL; - $this->addSequentialPages($pages, $action); + $this->addSequentialPages($pages); } } diff --git a/ext/legacycustomsearches/CRM/Legacycustomsearches/StateMachine/Search.php b/ext/legacycustomsearches/CRM/Legacycustomsearches/StateMachine/Search.php index 46a18ee942..ad7b495833 100644 --- a/ext/legacycustomsearches/CRM/Legacycustomsearches/StateMachine/Search.php +++ b/ext/legacycustomsearches/CRM/Legacycustomsearches/StateMachine/Search.php @@ -50,7 +50,7 @@ class CRM_Legacycustomsearches_StateMachine_Search extends CRM_Core_StateMachine $this->_pages['CRM_Contact_Form_Task_Result'] = NULL; } - $this->addSequentialPages($this->_pages, $action); + $this->addSequentialPages($this->_pages); } /** -- 2.25.1