Ensure page works well in subfolders. Fixes #2505

Author: lonnieezell

system/Pager/Pager.php

@@ -503,7 +503,7 @@ protected function ensureGroup(string $group)
 		}
 
 		$this->groups[$group] = [
-			'uri'          => clone Services::request()->uri,
+			'uri'          => clone current_url(true),
 			'hasMore'      => false,
 			'total'        => null,
 			'perPage'      => $this->config->perPage,
@@ -520,7 +520,7 @@ protected function ensureGroup(string $group)
 	}
 
 	//--------------------------------------------------------------------
-	
+
 	/**
 	 * Calculating the current page
 	 *
@@ -545,7 +545,7 @@ protected function calculateCurrentPage(string $group)
 
 			$page = (int) ($_GET[$pageSelector] ?? 1);
 
-			$this->groups[$group]['currentPage']  = $page < 1 ? 1 : $page;
+			$this->groups[$group]['currentPage'] = $page < 1 ? 1 : $page;
 		}
 	}