Merge pull request #1444 from fabrixxm/issue-1341

fix paginate url
2015-03-23 15:19:35 +01:00
parent 8b5d9c32a7 add3411542
commit 3d297c065e
1 changed files with 1 additions and 1 deletions
--- a/include/text.php
+++ b/include/text.php
@@ -270,7 +270,7 @@ if(! function_exists('paginate_data')) {
 * @return Array data for pagination template
 */
 function paginate_data(&$a, $count=null) {
-	$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
+	$stripped = preg_replace('/([&?]page=[0-9]*)/','',$a->query_string);

 	$stripped = str_replace('q=','',$stripped);
 	$stripped = trim($stripped,'/');