From c7c449f80eed9dfc2de83dbad89bf6fd6ec98120 Mon Sep 17 00:00:00 2001 From: "Matthew Wire (MJW Consulting)" Date: Tue, 22 Oct 2019 15:27:36 +0100 Subject: [PATCH] Make getSettingPageFilter() public so we can conditionally load resources in hooks --- CRM/Admin/Form/SettingTrait.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CRM/Admin/Form/SettingTrait.php b/CRM/Admin/Form/SettingTrait.php index ec6e15cfa7..2baa13a056 100644 --- a/CRM/Admin/Form/SettingTrait.php +++ b/CRM/Admin/Form/SettingTrait.php @@ -126,9 +126,11 @@ trait CRM_Admin_Form_SettingTrait { } /** + * This is public so we can retrieve the filter name via hooks etc. and apply conditional logic (eg. loading javascript conditionals). + * * @return string */ - protected function getSettingPageFilter() { + public function getSettingPageFilter() { if (!isset($this->_filter)) { // Get the last URL component without modifying the urlPath property. $urlPath = array_values($this->urlPath); -- 2.25.1