From 98d57a82b4c0c5802c55dbc8390223dd3ed8cdfc Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Fri, 11 Jan 2013 11:38:17 -0800
Subject: [PATCH] $_GET should not be overwritten.

---
 flight/net/Request.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/flight/net/Request.php b/flight/net/Request.php
index 26c991a..c3da429 100644
--- a/flight/net/Request.php
+++ b/flight/net/Request.php
@@ -58,7 +58,7 @@ class Request {
                 'cookies' => new Collection($_COOKIE),
                 'files' => new Collection($_FILES),
                 'secure' => getenv('HTTPS') && getenv('HTTPS') != 'off',
-                'accept' => getenv('HTTP_ACCEPT'),
+                'accept' => getenv('HTTP_ACCEPT') ?: '',
                 'proxy_ip' => $this->getProxyIpAddress()
             );
         }
@@ -84,7 +84,7 @@ class Request {
             $this->url = '/';
         }
         else {
-            $_GET = self::parseQuery($this->url);
+            $_GET += self::parseQuery($this->url);
 
             $this->query->setData($_GET);
         }