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

fixed a few bugs.

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
laravel/ioc.php
View File

@ -24,9 +24,10 @@ 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'];
}
} }
/** /**

4
laravel/session/payload.php
View File

@ -171,7 +171,9 @@ public function flash($key, $value)
*/ */
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);
} }
/** /**