adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 18:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor code cleanup, removing remnants from an older version that no longer apply

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6894 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
TommyO 2008-05-15 20:17:58 +00:00
parent 1623fa89f8
commit de086b1be3
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
cake/libs/model/datasources/dbo_source.php
View file

@ -601,7 +601,6 @@ class DboSource extends DataSource {
if ($model->recursive > 0) { if ($model->recursive > 0) {
foreach ($model->__associations as $type) { foreach ($model->__associations as $type) {
foreach ($model->{$type} as $assoc => $assocData) { foreach ($model->{$type} as $assoc => $assocData) {
$db = null;
$linkModel =& $model->{$assoc}; $linkModel =& $model->{$assoc};
if (!in_array($type . '/' . $assoc, $linkedModels)) { if (!in_array($type . '/' . $assoc, $linkedModels)) {
@ -613,11 +612,9 @@ class DboSource extends DataSource {
} elseif ($model->recursive > 1 && ($type == 'belongsTo' || $type == 'hasOne')) { } elseif ($model->recursive > 1 && ($type == 'belongsTo' || $type == 'hasOne')) {
// Do recursive joins on belongsTo and hasOne relationships // Do recursive joins on belongsTo and hasOne relationships
$db =& $this; $db =& $this;
} else {
unset ($db);
} }
if (isset($db) && $db != null) { if (isset($db)) {
$stack = array($assoc); $stack = array($assoc);
$db->queryAssociation($model, $linkModel, $type, $assoc, $assocData, $array, true, $resultSet, $model->recursive - 1, $stack); $db->queryAssociation($model, $linkModel, $type, $assoc, $assocData, $array, true, $resultSet, $model->recursive - 1, $stack);
unset($db); unset($db);
@ -633,37 +630,36 @@ class DboSource extends DataSource {
return $resultSet; return $resultSet;
} }
/** /**
* Private method. Passes association results thru afterFind filter of corresponding model * Private method. Passes association results thru afterFind filters of corresponding model
* *
* @param unknown_type $results * @param array $results Reference of resultset to be filtered
* @param unknown_type $model * @param object $model Instance of model to operate against
* @param unknown_type $filtered * @param array $filtered List of classes already filtered, to be skipped
* @return unknown * @return return
*/ */
function __filterResults(&$results, &$model, $filtered = array()) { function __filterResults(&$results, &$model, $filtered = array()) {
$filtering = array(); $filtering = array();
$associations = array_merge($model->belongsTo, $model->hasOne, $model->hasMany, $model->hasAndBelongsToMany);
$count = count($results); $count = count($results);
for ($i = 0; $i < $count; $i++) { for ($i = 0; $i < $count; $i++) {
if (is_array($results[$i])) { if (is_array($results[$i])) {
$keys = array_keys($results[$i]); $classNames = array_keys($results[$i]);
$count2 = count($keys); $count2 = count($classNames);
for ($j = 0; $j < $count2; $j++) { for ($j = 0; $j < $count2; $j++) {
$className = $key = $keys[$j]; $className = $classNames[$j];
if ($model->alias != $className && !in_array($key, $filtered)) { if ($model->alias != $className && !in_array($className, $filtered)) {
if (!in_array($key, $filtering)) { if (!in_array($className, $filtering)) {
$filtering[] = $key; $filtering[] = $className;
} }
if (isset($model->{$className}) && is_object($model->{$className})) { if (isset($model->{$className}) && is_object($model->{$className})) {
$data = $model->{$className}->afterFind(array(array($key => $results[$i][$key])), false); $data = $model->{$className}->afterFind(array(array($className => $results[$i][$className])), false);
} }
if (isset($data[0][$key])) { if (isset($data[0][$className])) {
$results[$i][$key] = $data[0][$key]; $results[$i][$className] = $data[0][$className];
} }
} }
} }