ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a few bugs.

Browse Source
This commit is contained in:
Taylor Otwell
2011-11-11 21:42:36 -06:00
parent b6ab0b08ce
commit 270e0d4994
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
laravel/ioc.php
View File

@@ -24,10 +24,11 @@ class IoC {
*/ */
public static function bootstrap($registry = array()) public static function bootstrap($registry = array())
{ {
Config::load('container'); if (Config::load('container'))
{
static::$registry = Config::$items['container']; static::$registry = Config::$items['container'];
} }
}
/** /**
* Register an object and its resolver. * Register an object and its resolver.

4
laravel/session/payload.php
View File

@@ -171,7 +171,9 @@ class Payload {
*/ */
public function reflash() public function reflash()
{ {
$this->session['data'][':new:'] += $this->session['data'][':old:']; $old = $this->session['data'][':old:'];
$this->session['data'][':new:'] = array_merge($this->session['data'][':new:'], $old);
} }
/** /**