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

This commit is contained in:
Taylor Otwell
2012-01-17 09:15:12 -06:00

View File

@@ -159,7 +159,7 @@ class Bundle {
*/ */
public static function assets($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().'/';
} }
/** /**