Skip to content

Commit

Permalink
Merge pull request #25514 from eileenmcnaughton/smarty-search
Browse files Browse the repository at this point in the history
A couple of minor smarty notice fixes
  • Loading branch information
demeritcowboy authored Feb 11, 2023
2 parents d1d12c1 + 8e3667d commit 3936739
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CRM/Contribute/Form/Search.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ public function preProcess() {
$this->_done = FALSE;

parent::preProcess();
// For contributionTotals.tpl
$this->addExpectedSmartyVariables(['annual']);

$this->_queryParams = CRM_Contact_BAO_Query::convertFormValues($this->_formValues);
$selector = new CRM_Contribute_Selector_Search($this->_queryParams,
Expand Down
4 changes: 2 additions & 2 deletions CRM/Core/Form/Search.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ public function preProcess() {
$this->handleForcedSearch();
}
$this->_formValues = $this->getFormValues();
// For searchResultsTasks.tpl.
$this->addExpectedSmartyVariables(['savedSearch', 'selectorLabel']);
// For searchResultsTasks.tpl & displaySearchCriteria.tpl
$this->addExpectedSmartyVariables(['savedSearch', 'selectorLabel', 'operator']);
}

/**
Expand Down

0 comments on commit 3936739

Please sign in to comment.