From 4513007f3595682b8f216542858aa69d45d1c7d7 Mon Sep 17 00:00:00 2001
From: dho <dho@3807eeeb-6ff5-0310-8944-8be069107fe0>
Date: Fri, 11 May 2007 13:05:55 +0000
Subject: [PATCH] Applying patch of ticket #2560

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5040 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/controller/scaffold.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php
index 69ee8b306..e9fda2ece 100644
--- a/cake/libs/controller/scaffold.php
+++ b/cake/libs/controller/scaffold.php
@@ -184,7 +184,7 @@ class Scaffold extends Object {
 		$this->controller->set('viewPath', $this->viewPath);
 		$this->controller->set('humanSingularName', Inflector::humanize($this->modelKey));
 		$this->controller->set('humanPluralName', Inflector::humanize($this->viewPath));
-		$alias = null;
+		$alias = array();
 		if(!empty($this->ScaffoldModel->alias)) {
 			$alias = array_combine(array_keys($this->ScaffoldModel->alias), array_keys($this->ScaffoldModel->alias));
 		}