X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FPager.php;h=0774e49009cbd96bfe9e394da9d658c9e8d37755;hb=57bab6b5fb5bdc40ef82371c8f0b29cf9237c619;hp=26bb54c737d9e7e62ae5b68f137729bbe953efbc;hpb=634aee3dd96fc74e3d5aaedb6774818aa9579721;p=civicrm-core.git

diff --git a/CRM/Utils/Pager.php b/CRM/Utils/Pager.php
index 26bb54c737..0774e49009 100644
--- a/CRM/Utils/Pager.php
+++ b/CRM/Utils/Pager.php
@@ -83,10 +83,10 @@ class CRM_Utils_Pager extends Pager_Sliding {
       'last' => $this->getLastPageLink(),
       'currentPage' => $this->getCurrentPageID(),
       'numPages' => $this->numPages(),
-      'csvString' => CRM_Utils_Array::value('csvString', $params),
-      'status' => CRM_Utils_Array::value('status', $params),
-      'buttonTop' => CRM_Utils_Array::value('buttonTop', $params),
-      'buttonBottom' => CRM_Utils_Array::value('buttonBottom', $params),
+      'csvString' => $params['csvString'] ?? NULL,
+      'status' => $params['status'] ?? NULL,
+      'buttonTop' => $params['buttonTop'] ?? NULL,
+      'buttonBottom' => $params['buttonBottom'] ?? NULL,
       'currentLocation' => $this->getCurrentLocation(),
     ];
 
@@ -239,8 +239,7 @@ class CRM_Utils_Pager extends Pager_Sliding {
    * @return string
    */
   public function getCurrentLocation() {
-    $config = CRM_Core_Config::singleton();
-    $path = CRM_Utils_Array::value($config->userFrameworkURLVar, $_GET);
+    $path = CRM_Utils_System::currentPath();
     return CRM_Utils_System::url($path, CRM_Utils_System::getLinksUrl(self::PAGE_ID, FALSE, TRUE), FALSE, NULL, FALSE) . $this->getCurrentPageID();
   }