Skip to content

S
syncEnrollments
Commit 270e0d49 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

fixed a few bugs.

parent b6ab0b08
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
laravel/ioc.php
View file @ 270e0d49
......@@ -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'];
}
}
/**
......
laravel/session/payload.php
View file @ 270e0d49
......@@ -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);
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment