Merge branch 'master' of git://github.com/kohana/core

kohana · Jun 6, 2010 · 6dc4bb1 · 6dc4bb1
2 parents c5419dc + 249f5aa
commit 6dc4bb1
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/classes/kohana/url.php b/classes/kohana/url.php
@@ -87,7 +87,7 @@ public static function site($uri = '', $protocol = FALSE)
 		if ($fragment = parse_url($uri, PHP_URL_FRAGMENT))
 		{
 			// #fragment
-			$fragment =  '#'.$fragment;
+			$fragment = '#'.$fragment;
 		}
 
 		// Concat the URL
@@ -104,6 +104,8 @@ public static function site($uri = '', $protocol = FALSE)
 	 * Typically you would use this when you are sorting query results,
 	 * or something similar.
 	 *
+	 * [!!] Parameters with a NULL value are left out.
+	 *
 	 * @param   array   array of GET parameters
 	 * @return  string
 	 */
@@ -126,7 +128,10 @@ public static function query(array $params = NULL)
 			return '';
 		}
 
-		return '?'.http_build_query($params, '', '&');
+		$query = http_build_query($params, '', '&');
+
+		// Don't prepend '?' to an empty string
+		return ($query === '') ? '' : '?'.$query;
 	}
 
 	/**