From 96c56d7446cd6fc6ccc0b9486cd2e465d7bd5bf0 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Thu, 14 Jan 2010 22:54:17 -0500
Subject: [PATCH] Fixing failing tests in php4 caused by missing & operators.
---
cake/libs/controller/controller.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index 98e1b3a6c..55a31f08a 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -1031,18 +1031,18 @@ class Controller extends Object {
}
if ($assoc && isset($this->{$object}->{$assoc})) {
- $object = $this->{$object}->{$assoc};
+ $object =& $this->{$object}->{$assoc};
} elseif (
$assoc && isset($this->{$this->modelClass}) &&
isset($this->{$this->modelClass}->{$assoc}
)) {
- $object = $this->{$this->modelClass}->{$assoc};
+ $object =& $this->{$this->modelClass}->{$assoc};
} elseif (isset($this->{$object})) {
- $object = $this->{$object};
+ $object =& $this->{$object};
} elseif (
isset($this->{$this->modelClass}) && isset($this->{$this->modelClass}->{$object}
)) {
- $object = $this->{$this->modelClass}->{$object};
+ $object =& $this->{$this->modelClass}->{$object};
}
} elseif (empty($object) || $object === null) {
if (isset($this->{$this->modelClass})) {