Permalink
Browse files

Fixing failing tests in php4 caused by missing & operators.

  • Loading branch information...
1 parent 5212406 commit 96c56d7446cd6fc6ccc0b9486cd2e465d7bd5bf0 @markstory markstory committed Jan 15, 2010
Showing with 4 additions and 4 deletions.
  1. +4 −4 cake/libs/controller/controller.php
@@ -1031,18 +1031,18 @@ function paginate($object = null, $scope = array(), $whitelist = array()) {
}
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})) {

0 comments on commit 96c56d7

Please sign in to comment.