Merge branch 'staging' of github.com:laravel/laravel into staging
This commit is contained in:
commit
ff94d16630
|
@ -65,7 +65,10 @@ public function eagerly_constrain($results)
|
|||
// are looking for the parent of a child model in this relationship.
|
||||
foreach ($results as $result)
|
||||
{
|
||||
$keys[] = $result->{$this->foreign_key()};
|
||||
if ( ! is_null($key = $result->{$this->foreign_key()}))
|
||||
{
|
||||
$keys[] = $key;
|
||||
}
|
||||
}
|
||||
|
||||
$this->table->where_in($this->model->key(), array_unique($keys));
|
||||
|
|
|
@ -26,6 +26,17 @@ function __($key, $replacements = array(), $language = null)
|
|||
return Laravel\Lang::line($key, $replacements, $language);
|
||||
}
|
||||
|
||||
/**
|
||||
* Dump the given value and kill the script.
|
||||
*
|
||||
* @param mixed $value
|
||||
* @return void
|
||||
*/
|
||||
function dd($value)
|
||||
{
|
||||
die(var_dump($value));
|
||||
}
|
||||
|
||||
/**
|
||||
* Get an item from an array using "dot" notation.
|
||||
*
|
||||
|
|
Loading…
Reference in New Issue