From 87db96638384dcf548aa589de731aa54c856deab Mon Sep 17 00:00:00 2001 From: predominant Date: Mon, 3 May 2010 13:36:32 +1000 Subject: [PATCH] Remove PHP5 conditional statements. --- cake/libs/controller/controller.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php index 040f2a139..480b58004 100644 --- a/cake/libs/controller/controller.php +++ b/cake/libs/controller/controller.php @@ -594,15 +594,9 @@ class Controller extends Object { if (($cached === false)) { $this->modelNames[] = $modelClass; - if (!PHP5) { - $this->{$modelClass} =& ClassRegistry::init(array( - 'class' => $plugin . $modelClass, 'alias' => $modelClass, 'id' => $id - )); - } else { - $this->{$modelClass} = ClassRegistry::init(array( - 'class' => $plugin . $modelClass, 'alias' => $modelClass, 'id' => $id - )); - } + $this->{$modelClass} = ClassRegistry::init(array( + 'class' => $plugin . $modelClass, 'alias' => $modelClass, 'id' => $id + )); if (!$this->{$modelClass}) { return $this->cakeError('missingModel', array(array(