Merge pull request #10423 from dreamsxin/10421

Fix bug #10421
phalcon · May 28, 2015 · 669264d · 669264d
2 parents bd291e9 + d9f411f
commit 669264d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/phalcon/mvc/url.zep b/phalcon/mvc/url.zep
@@ -243,7 +243,7 @@ class Url implements UrlInterface, InjectionAwareInterface
 		if args {
 			let queryString = http_build_query(args);
 			if typeof queryString == "string" && strlen(queryString) {
-				if strpos(queryString, "?") !== false {
+				if strpos(uri, "?") !== false {
 					let uri .= "&" . queryString;
 				} else {
 					let uri .= "?" . queryString;

diff --git a/unit-tests/UrlTest.php b/unit-tests/UrlTest.php
@@ -30,5 +30,9 @@ public function testGet()
 		$this->assertEquals('http://www.test.com/', $url->get(''));
 		$this->assertEquals('http://www.test.com/', $url->get('/'));
 		$this->assertEquals('http://www.test.com/path', $url->get('/path'));
+
+		$url->setBaseUri('http://www.test.com/?_url=/');
+
+		$this->assertEquals('http://www.test.com/?_url=/path&params=one', $url->get('/path', array('params' => 'one')));
 	}
 }