Skip to content
This repository has been archived by the owner on Jul 16, 2023. It is now read-only.

Commit

Permalink
Merge pull request #269 from chriskonnertz/master
Browse files Browse the repository at this point in the history
Updated the newQuery() method to work with Laravel 4.2. Closes #211; superseeds and closes #227.
  • Loading branch information
igorsantos07 committed May 22, 2015
2 parents ddc6cbf + b3eb963 commit 402fe62
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions src/LaravelBook/Ardent/Ardent.php
Original file line number Diff line number Diff line change
Expand Up @@ -921,12 +921,7 @@ public function newQuery($excludeDeleted = true) {
// while it is constructing and executing various queries against it.
$builder->setModel($this)->with($this->with);

if ($excludeDeleted and $this->softDelete)
{
$builder->whereNull($this->getQualifiedDeletedAtColumn());
}

return $builder;
return $this->applyGlobalScopes($builder);
}

/**
Expand Down

0 comments on commit 402fe62

Please sign in to comment.