From 270e0d499423dd43b3781507b88158e95ec93ff5 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 11 Nov 2011 21:42:36 -0600 Subject: [PATCH] fixed a few bugs. --- laravel/ioc.php | 7 ++++--- laravel/session/payload.php | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/laravel/ioc.php b/laravel/ioc.php index f573852b..fe4111e5 100644 --- a/laravel/ioc.php +++ b/laravel/ioc.php @@ -24,9 +24,10 @@ class IoC { */ public static function bootstrap($registry = array()) { - Config::load('container'); - - static::$registry = Config::$items['container']; + if (Config::load('container')) + { + static::$registry = Config::$items['container']; + } } /** diff --git a/laravel/session/payload.php b/laravel/session/payload.php index 6f4b1347..d045e2a8 100644 --- a/laravel/session/payload.php +++ b/laravel/session/payload.php @@ -171,7 +171,9 @@ class Payload { */ 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); } /**