Merge branch 'develop' of github.com:laravel/laravel into develop

2012-01-17 09:15:12 -06:00
parent f53ebbf672 9e690c8af6
commit b218e80d5a
1 changed files with 1 additions and 1 deletions
--- a/laravel/bundle.php
+++ b/laravel/bundle.php
@@ -159,7 +159,7 @@ class Bundle {
 	 */
 	public static function assets($bundle)
 	{
-		return ($bundle != DEFAULT_BUNDLE) ? PUBLIC_PATH."bundles/{$bundle}/" : PUBLIC_PATH;
+		return ($bundle != DEFAULT_BUNDLE) ? URL::base()."/bundles/{$bundle}/" : URL::base().'/';
 	}

 	/**