Mwalker has submitted this change and it was merged.
Change subject: (FR #716) force search was necessary in some circumstances
......................................................................
(FR #716) force search was necessary in some circumstances
Change-Id: I22574f5f34c2899ddb54b6c369b15562157b2c3e
---
M sites/all/modules/civicrm/CRM/Contribute/Form/Search.php
1 file changed, 8 insertions(+), 4 deletions(-)
Approvals:
Mwalker: Verified; Looks good to me, approved
diff --git a/sites/all/modules/civicrm/CRM/Contribute/Form/Search.php
b/sites/all/modules/civicrm/CRM/Contribute/Form/Search.php
index 09ec752..489163d 100644
--- a/sites/all/modules/civicrm/CRM/Contribute/Form/Search.php
+++ b/sites/all/modules/civicrm/CRM/Contribute/Form/Search.php
@@ -163,13 +163,17 @@
*/
$this->_reset = CRM_Utils_Request::retrieve( 'reset', 'Boolean',
CRM_Core_DAO::$_nullObject );
- /**
- * WMF HACK: "force" causes a search with null criteria. Disable
until this is fixed.
- * $this->_force = CRM_Utils_Request::retrieve( 'force', 'Boolean',
$this, false );
- */
+ $this->_force = CRM_Utils_Request::retrieve( 'force', 'Boolean',
$this, false );
$this->_limit = CRM_Utils_Request::retrieve( 'limit', 'Positive',
$this );
$this->_context = CRM_Utils_Request::retrieve( 'context', 'String',
$this, false, 'search' );
+ /*
+ * WMF HACK: "force" causes a search with null criteria. Disable
until this is fixed.
+ */
+ if ( $this->_context === "search" ) {
+ $this->_force = false;
+ }
+
$this->assign( "context", $this->_context );
// get user submitted values
--
To view, visit https://gerrit.wikimedia.org/r/53396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I22574f5f34c2899ddb54b6c369b15562157b2c3e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm
Gerrit-Branch: master
Gerrit-Owner: Adamw <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
