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

Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Taylor Otwell 2012-03-04 22:04:50 -06:00
parent 46595ce55e 89dc8903ec
commit b549e30c7c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artisan
View File

@ -3,7 +3,7 @@
* Laravel - A PHP Framework For Web Artisans * Laravel - A PHP Framework For Web Artisans
* *
* @package Laravel * @package Laravel
* @version 3.0.3 * @version 3.0.4
* @author Taylor Otwell <taylorotwell@gmail.com> * @author Taylor Otwell <taylorotwell@gmail.com>
* @link http://laravel.com * @link http://laravel.com
*/ */

2
laravel/ioc.php
View File

@ -130,7 +130,7 @@ public static function resolve($name, $parameters = array())
// If the resolver is registering as a singleton resolver, we will cache // If the resolver is registering as a singleton resolver, we will cache
// the instance of the object in the container so we can resolve it next // the instance of the object in the container so we can resolve it next
// time without having to instantiate a brand new instance. // time without having to instantiate a brand new instance.
if (isset(static::$registry[$name]['singleton'])) if (static::$registry[$name]['singleton'])
{ {
return static::$singletons[$name] = $object; return static::$singletons[$name] = $object;
} }

2
paths.php
View File

@ -3,7 +3,7 @@
* Laravel - A PHP Framework For Web Artisans * Laravel - A PHP Framework For Web Artisans
* *
* @package Laravel * @package Laravel
* @version 3.0.3 * @version 3.0.4
* @author Taylor Otwell <taylorotwell@gmail.com> * @author Taylor Otwell <taylorotwell@gmail.com>
* @link http://laravel.com * @link http://laravel.com
*/ */

2
public/index.php
View File

@ -3,7 +3,7 @@
* Laravel - A PHP Framework For Web Artisans * Laravel - A PHP Framework For Web Artisans
* *
* @package Laravel * @package Laravel
* @version 3.0.3 * @version 3.0.4
* @author Taylor Otwell <taylorotwell@gmail.com> * @author Taylor Otwell <taylorotwell@gmail.com>
* @link http://laravel.com * @link http://laravel.com
*/ */