Skip to content

Commit

Permalink
Merge branch '3.0' into 3.1
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/Handlers/Eloquent.php

Signed-off-by: crynobone <crynobone@gmail.com>
  • Loading branch information
crynobone committed Mar 10, 2016
2 parents ab276aa + 81eca1b commit 2f31723
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/Handlers/Eloquent.php
Expand Up @@ -76,7 +76,7 @@ protected function save($key, $value, $isNew = false)
*/
protected function delete($key)
{
$this->resolver()->where('name', '=', $key)->delete();
$this->resolver()->where('id', '=', $this->getKeyId($key))->delete();
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Handlers/Fluent.php
Expand Up @@ -77,7 +77,7 @@ protected function save($key, $value, $isNew = false)
*/
protected function delete($key)
{
$this->resolver()->where('id', '=', $id)->delete();
$this->resolver()->where('id', '=', $this->getKeyId($key))->delete();
}

/**
Expand Down

0 comments on commit 2f31723

Please sign in to comment.