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

Merge branch 'staging' of github.com:laravel/laravel into staging

This commit is contained in:
Taylor Otwell 2012-04-18 20:38:46 -05:00
parent 51f5fdd0c9 b7ac667405
commit ff94d16630
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
laravel/database/eloquent/relationships/belongs_to.php
View File

@ -65,7 +65,10 @@ public function eagerly_constrain($results)
// are looking for the parent of a child model in this relationship. // are looking for the parent of a child model in this relationship.
foreach ($results as $result) 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)); $this->table->where_in($this->model->key(), array_unique($keys));

11
laravel/helpers.php
View File

@ -26,6 +26,17 @@ function __($key, $replacements = array(), $language = null)
return Laravel\Lang::line($key, $replacements, $language); 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. * Get an item from an array using "dot" notation.
* *