aboutsummaryrefslogtreecommitdiffstats
path: root/index.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 /index.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 'index.php')
-rwxr-xr-xindex.php1
1 files changed, 1 insertions, 0 deletions
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);
}
/**