From f80966324560d4309b3bb2d6d357719e1e90e6aa Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 15 Jun 2009 16:51:49 -0700
Subject: a little better query handling in redirect code

---
 classes/Status_network.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'classes')

diff --git a/classes/Status_network.php b/classes/Status_network.php
index 128721f41..03e8f4525 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -93,8 +93,19 @@ class Status_network extends DB_DataObject
     function redirectToHostname()
     {
         $destination = 'http://'.$this->hostname;
-        $destination .= $_SERVER['REQUEST_URI'].
-          $_SERVER['QUERY_STRING'];
+        $destination .= $_SERVER['REQUEST_URI'];
+
+        $args = $_GET;
+
+        if (isset($args['p'])) {
+            unset($args['p']);
+        }
+
+        $query = http_build_query($args);
+
+        if (strlen($query) > 0) {
+            $destination .= '?' . $query;
+        }
 
         $old = 'http'.
           (($_SERVER['HTTPS'] == 'on') ? 'S' : '').
-- 
cgit v1.2.3-54-g00ecf