Fixes #10610

phalcon · Jul 20, 2015 · 9abe226 · 9abe226
1 parent 102ea24
commit 9abe226
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 13 deletions.
diff --git a/ext/phalcon/mvc/url.zep.c b/ext/phalcon/mvc/url.zep.c
diff --git a/phalcon/mvc/url.zep b/phalcon/mvc/url.zep
@@ -109,6 +109,7 @@ class Url implements UrlInterface, InjectionAwareInterface
 
 		let baseUri = this->_baseUri;
 		if baseUri === null {
+
 			if fetch phpSelf, _SERVER["PHP_SELF"] {
 				let uri = phalcon_get_uri(phpSelf);
 			} else {
@@ -120,6 +121,7 @@ class Url implements UrlInterface, InjectionAwareInterface
 			} else {
 				let baseUri = "/" . uri ."/";
 			}
+
 			let this->_baseUri = baseUri;
 		}
 		return baseUri;
@@ -172,6 +174,7 @@ class Url implements UrlInterface, InjectionAwareInterface
 	 */
 	public function get(var uri = null, var args = null, var local = null, var baseUri = null) -> string
 	{
+		string strUri;
 		var router, dependencyInjector, routeName, route, queryString;
 
 		if local == null {
@@ -227,7 +230,12 @@ class Url implements UrlInterface, InjectionAwareInterface
 		}
 
 		if local {
-			let uri = baseUri . uri;			
+			let strUri = (string) uri;
+			if strlen(strUri) > 2 && strUri[0] == '/' && strUri[1] != '/' {
+				let uri = baseUri . substr(strUri, 1);
+			} else {
+				let uri = baseUri . strUri;
+			}
 		}
 
 		if args {