adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-10 05:22:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reduce variable use/duplicate code.

Browse source
This commit is contained in:
Kim Egede Jakobsen 2013-09-01 12:08:48 -07:00
parent 64cf40558f
commit 09bdad6ceb
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/Cake/Model/Model.php
View file

@ -796,8 +796,8 @@ class Model extends Object implements CakeEventListener {
if ($result !== array('unhandled')) {
return $result;
}
$return = $this->getDataSource()->query($method, $params, $this);
return $return;
return $this->getDataSource()->query($method, $params, $this);
}
/**
@ -2957,8 +2957,9 @@ class Model extends Object implements CakeEventListener {
* @return array
*/
protected function _findNeighbors($state, $query, $results = array()) {
extract($query);
if ($state === 'before') {
extract($query);
$conditions = (array)$conditions;
if (isset($field) && isset($value)) {
if (strpos($field, '.') === false) {
@ -2976,7 +2977,6 @@ class Model extends Object implements CakeEventListener {
return $query;
}
extract($query);
unset($query['conditions'][$field . ' <']);
$return = array();
if (isset($results[0])) {