aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-04-03 09:27:46 +0200
committerzottel <github@zottel.net>2012-04-03 09:27:46 +0200
commite5cd5aab5cf5fd5019ec3178f09f5515c390c9d9 (patch)
tree76e322f19d3ada0106a2c7c9664537e602ed88ed /include/text.php
parent7127626f55f0ae5843d38145bf80022b98e4a8d8 (diff)
parent5d0d9f877294258cb90e1c496b4db750ee99f3ca (diff)
downloadvolse-hubzilla-e5cd5aab5cf5fd5019ec3178f09f5515c390c9d9.tar.gz
volse-hubzilla-e5cd5aab5cf5fd5019ec3178f09f5515c390c9d9.tar.bz2
volse-hubzilla-e5cd5aab5cf5fd5019ec3178f09f5515c390c9d9.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/text.php')
-rw-r--r--include/text.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/text.php b/include/text.php
index e1e040750..5456b5ad3 100644
--- a/include/text.php
+++ b/include/text.php
@@ -225,6 +225,9 @@ if(! function_exists('paginate')) {
function paginate(&$a) {
$o = '';
$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
+
+// $stripped = preg_replace('/&zrl=(.*?)([\?&]|$)/ism','',$stripped);
+
$stripped = str_replace('q=','',$stripped);
$stripped = trim($stripped,'/');
$pagenum = $a->pager['page'];