From: fabrixxm <fabrix.xm@gmail.com>
Date: Sun, 22 Mar 2015 15:38:05 +0000 (+0100)
Subject: fix paginate url
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=add3411542fada516b4ac28d8ade33459a268d2e;p=friendica.git

fix paginate url
pagination url wasn't alway stripping 'page' parameter from url
related to issue #1341
---

diff --git a/include/text.php b/include/text.php
index 4aa529d316..8ce54b3c67 100644
--- 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,'/');