Make querystrings more durable.

cakephp · Dec 27, 2012 · e454238 · e454238
1 parent de00c98
commit e454238
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/Cake/Network/Http/Client.php b/lib/Cake/Network/Http/Client.php
@@ -188,7 +188,8 @@ public function buildUrl($url, $query = [], $options = []) {
 			return $url;
 		}
 		if ($query) {
-			$url .= '?' . http_build_query($query);
+			$q = (strpos($url, '?') === false) ? '?' : '&';
+			$url .= $q . http_build_query($query);
 		}
 		if (preg_match('#^https?://#', $url)) {
 			return $url;

diff --git a/lib/Cake/Test/TestCase/Network/Http/ClientTest.php b/lib/Cake/Test/TestCase/Network/Http/ClientTest.php
@@ -120,6 +120,13 @@ public static function urlProvider() {
 				[],
 				'query string data.'
 			],
+			[
+				'http://example.com/search?q=hi+there&id=12',
+				'http://example.com/search?q=hi+there',
+				['id' => '12'],
+				[],
+				'query string data with some already on the url.'
+			],
 		];
 	}