Twig url_for fix

Signed-off-by: Steven Hoffman <[email protected]>
SimpleMachines · Aug 18, 2012 · ad2e78a · ad2e78a
1 parent 5df1dd8
commit ad2e78a
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/library/smCore/Twig/Extension.php b/library/smCore/Twig/Extension.php
@@ -170,13 +170,15 @@ public static function function_url_for($endpoint, array $query_arguments = arra
 	{
 		if (!empty($endpoint))
 		{
-			$url = self::$_container['settings']['url'] . '/' . trim($endpoint, '/') . '/';
+			$url = '/' . trim($endpoint, '/') . '/';
 		}
 		else
 		{
-			$url = self::$_container['settings']['url'] . '/';
+			$url = '/';
 		}
 
+		$query = '';
+
 		if (!empty($query_arguments))
 		{
 			$arguments = array();
@@ -193,10 +195,10 @@ public static function function_url_for($endpoint, array $query_arguments = arra
 				}
 			}
 
-			return $url . '?' . implode(';', $arguments);
+			$query = '?' . implode(';', $arguments);
 		}
 
-		return $url;
+		return self::$_container['settings']['url'] . str_replace('//', '/', $url) . $query;
 	}
 
 	/**