From 62e528ba43bedbd33eb81447775bd743f0c1acf8 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Apr 2012 00:45:45 -0700 Subject: [PATCH] remove zrl from query string --- include/text.php | 3 +++ index.php | 1 + 2 files changed, 4 insertions(+) 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']; diff --git a/index.php b/index.php index a51e33e26..e7227962f 100755 --- a/index.php +++ b/index.php @@ -95,6 +95,7 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) { if(x($_GET,'zrl')) { $_SESSION['my_url'] = $_GET['zrl']; + $a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string); } /**