Merge remote-tracking branch 'origin/develop' into 3.1-stable

NielBuys · NielBuys · commit 70011182c93c · 2025-02-13T09:43:24.000+02:00
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
@@ -509,7 +509,7 @@ public function create_links()
 				$this->uri_segment = count($this->CI->uri->segment_array());
 			}
 
-			$this->cur_page = $this->CI->uri->segment($this->uri_segment);
+			$this->cur_page = $this->CI->uri->segment($this->uri_segment, '');
 
 			// Remove any specified prefix/suffix from the segment.
 			if ($this->prefix !== '' OR $this->suffix !== '')

Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,7 @@ public function create_links()`
`509`	`509`	`$this->uri_segment = count($this->CI->uri->segment_array());`
`510`	`510`	`}`
`511`	`511`
`512`		`- $this->cur_page = $this->CI->uri->segment($this->uri_segment);`
	`512`	`+ $this->cur_page = $this->CI->uri->segment($this->uri_segment, '');`
`513`	`513`
`514`	`514`	`// Remove any specified prefix/suffix from the segment.`
`515`	`515`	`if ($this->prefix !== '' OR $this->suffix !== '')`