From: Coleman Watts Date: Wed, 29 Jul 2015 21:15:09 +0000 (-0400) Subject: CRM-16645 - Fix param name collision with wp X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4feb1cad3dd21f0a64ca1c757b0d2611abd078e1;p=civicrm-core.git CRM-16645 - Fix param name collision with wp ---------------------------------------- * CRM-16645: PCP Credit Dropdown Hard-coded to 10 results, no 'load more' https://issues.civicrm.org/jira/browse/CRM-16645 --- diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php index fb2b92e690..fa90cd3ac9 100644 --- a/CRM/Contact/Page/AJAX.php +++ b/CRM/Contact/Page/AJAX.php @@ -182,8 +182,8 @@ class CRM_Contact_Page_AJAX { } $offset = $count = 0; - if (!empty($_GET['page'])) { - $page = (int) $_GET['page']; + if (!empty($_GET['page_num'])) { + $page = (int) $_GET['page_num']; $offset = $limit * ($page - 1); $limit++; } diff --git a/templates/CRM/Contribute/Form/PCP.js.tpl b/templates/CRM/Contribute/Form/PCP.js.tpl index 11fa37f793..0eab30c261 100644 --- a/templates/CRM/Contribute/Form/PCP.js.tpl +++ b/templates/CRM/Contribute/Form/PCP.js.tpl @@ -35,7 +35,7 @@ ajax: { url: pcpURL, data: function(term, page) { - return {term: term, page: page}; + return {term: term, page_num: page}; }, results: function(response) { return response;