From 6fa1c1b3d42c63a0b842a383c311d5f446fdaeca Mon Sep 17 00:00:00 2001
From: pies <pies@3807eeeb-6ff5-0310-8944-8be069107fe0>
Date: Sun, 19 Jun 2005 04:42:52 +0000
Subject: [PATCH] - fix for Ticket #30

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@254 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 libs/bake.php  | 8 ++++----
 libs/model.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libs/bake.php b/libs/bake.php
index 40cc5bd39..e7d05a04f 100644
--- a/libs/bake.php
+++ b/libs/bake.php
@@ -95,11 +95,11 @@ class Bake extends Object {
 	function template ($type) {
 		switch ($type) {
 			case 'view': return "%s";
-			case 'model': return "<?PHP\n\nclass %s extends AppModel {\n}\n\n?>";
+			case 'model': return "<?php\n\nclass %s extends AppModel {\n}\n\n?>";
 			case 'action': return "\n\tfunction %s () {\n\t}\n";
-			case 'ctrl': return "<?PHP\n\nclass %s extends %s {\n%s\n}\n\n?>";
-			case 'helper': return "<?PHP\n\nclass %s extends AppController {\n}\n\n?>";
-			case 'test': return '<?PHP
+			case 'ctrl': return "<?php\n\nclass %s extends %s {\n%s\n}\n\n?>";
+			case 'helper': return "<?php\n\nclass %s extends AppController {\n}\n\n?>";
+			case 'test': return '<?php
 
 class %sTest extends TestCase {
 	var $abc;
diff --git a/libs/model.php b/libs/model.php
index 0ea0b3718..587393ec0 100644
--- a/libs/model.php
+++ b/libs/model.php
@@ -272,7 +272,7 @@ class Model extends Object
 					trigger_error('Application error occured, trying to set a field name that doesn\'t exist.', E_USER_WARNING);
 			}
 */
-			$n == 'id'? $this->id = $v: $this->data[$n] = $v;
+			$n == 'id'? $this->setId($v): $this->data[$n] = $v;
 		}
 
 		return $data;