Merge pull request #17813 from JKingsnorth/patch-15

[civicrm-core.git] / CRM / Utils / PagerAToZ.php

diff --git a/CRM/Utils/PagerAToZ.php b/CRM/Utils/PagerAToZ.php
index 51a1d525081411d23638e828adde6021e659bd6e..eeed2e961ab2fbb5d83038c1db29e593b919b75f 100644 (file)
--- a/CRM/Utils/PagerAToZ.php
+++ b/CRM/Utils/PagerAToZ.php
@@ -132,12 +132,10 @@ class CRM_Utils_PagerAToZ {
 
     $qfKey = NULL;
     if (isset($query->_formValues)) {
-      $qfKey = CRM_Utils_Array::value('qfKey', $query->_formValues);
+      $qfKey = $query->_formValues['qfKey'] ?? NULL;
     }
     if (empty($qfKey)) {
-      // CRM-20943 Can only pass variables by reference and also cannot use $this so using $empty setting to NULL which is default.
-      $emptyVariable = NULL;
-      $qfKey = CRM_Utils_Request::retrieve('qfKey', 'String', $emptyVariable, FALSE, NULL, $_REQUEST);
+      $qfKey = CRM_Utils_Request::retrieve('qfKey', 'String');
     }
 
     $aToZBar = [];