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

Fixing failing tests in php4 caused by missing & operators.

Browse source
This commit is contained in:
Mark Story 2010-01-14 22:54:17 -05:00
parent 5212406ea7
commit 96c56d7446
1 changed files with 4 additions and 4 deletions

8
cake/libs/controller/controller.php
View file

@ -1031,18 +1031,18 @@ class Controller extends Object {
} }
if ($assoc && isset($this->{$object}->{$assoc})) { if ($assoc && isset($this->{$object}->{$assoc})) {
$object = $this->{$object}->{$assoc}; $object =& $this->{$object}->{$assoc};
} elseif ( } elseif (
$assoc && isset($this->{$this->modelClass}) && $assoc && isset($this->{$this->modelClass}) &&
isset($this->{$this->modelClass}->{$assoc} isset($this->{$this->modelClass}->{$assoc}
)) { )) {
$object = $this->{$this->modelClass}->{$assoc}; $object =& $this->{$this->modelClass}->{$assoc};
} elseif (isset($this->{$object})) { } elseif (isset($this->{$object})) {
$object = $this->{$object}; $object =& $this->{$object};
} elseif ( } elseif (
isset($this->{$this->modelClass}) && isset($this->{$this->modelClass}->{$object} isset($this->{$this->modelClass}) && isset($this->{$this->modelClass}->{$object}
)) { )) {
$object = $this->{$this->modelClass}->{$object}; $object =& $this->{$this->modelClass}->{$object};
} }
} elseif (empty($object) || $object === null) { } elseif (empty($object) || $object === null) {
if (isset($this->{$this->modelClass})) { if (isset($this->{$this->modelClass})) {