Merge pull request #13270 from civicrm/5.9

[civicrm-core.git] / CRM / Core / Form / Search.php

diff --git a/CRM/Core/Form/Search.php b/CRM/Core/Form/Search.php
index 4ccd76ccd823c3af419581d6c2d6be62fe6b9d69..694953a4b69f66e93dc4bf9c299af8e02829715c 100644 (file)
--- a/CRM/Core/Form/Search.php
+++ b/CRM/Core/Form/Search.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -321,7 +321,7 @@ class CRM_Core_Form_Search extends CRM_Core_Form {
    * we allow the controller to set force/reset externally, useful when we are being
    * driven by the wizard framework
    */
-  protected function getUrlVariables() {
+  protected function loadStandardSearchOptionsFromUrl() {
     $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean');
     $this->_force = CRM_Utils_Request::retrieve('force', 'Boolean', $this, FALSE);
     $this->_limit = CRM_Utils_Request::retrieve('limit', 'Positive', $this);
@@ -335,7 +335,7 @@ class CRM_Core_Form_Search extends CRM_Core_Form {
    *
    * Get it from controller only if form has been submitted, else preProcess has set this
    */
-  protected function getFormVariables() {
+  protected function loadFormValues() {
     if (!empty($_POST)  && !$this->controller->isModal()) {
       $this->_formValues = $this->controller->exportValues($this->_name);
     }