Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #285 from sparksp/3.0b2/bundle-location 

Really default location to bundle name.
This commit is contained in:
Taylor Otwell 2012-01-28 12:08:13 -08:00
parent 161796e983 733392f72f
commit 409e908964
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
laravel/bundle.php
View File

@ -33,7 +33,7 @@ class Bundle {
*/ */
public static function register($bundle, $config = array()) public static function register($bundle, $config = array())
{ {
$defaults = array('location' => $bundle, 'handles' => null, 'auto' => false); $defaults = array('handles' => null, 'auto' => false);
// If the given config is actually a string, we will assume it is a location // If the given config is actually a string, we will assume it is a location
// and convert it to an array so that the developer may conveniently add // and convert it to an array so that the developer may conveniently add
@ -45,7 +45,7 @@ public static function register($bundle, $config = array())
if ( ! isset($config['location'])) if ( ! isset($config['location']))
{ {
throw new \Exception("Location not set for bundle [$bundle]"); $config['location'] = $bundle;
} }
// We will trim the trailing slash from the location and add it back so // We will trim the trailing slash from the location and add it back so