Remove PHP5 conditional statements.

cakephp · May 3, 2010 · 87db966 · 87db966
1 parent c1eaa4b
commit 87db966
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
@@ -594,15 +594,9 @@ public function loadModel($modelClass = null, $id = null) {
 		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(