Fixing baked actions to use request object.

Fixes #1091
cakephp · Nov 7, 2010 · af303f0 · af303f0
1 parent 1c37751
commit af303f0
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/cake/console/templates/default/actions/controller_actions.ctp b/cake/console/templates/default/actions/controller_actions.ctp
@@ -38,9 +38,9 @@
 
 <?php $compact = array(); ?>
 	public function <?php echo $admin ?>add() {
-		if (!empty($this->data)) {
+		if ($this->request->is('post')) {
 			$this-><?php echo $currentModelName; ?>->create();
-			if ($this-><?php echo $currentModelName; ?>->save($this->data)) {
+			if ($this-><?php echo $currentModelName; ?>->save($this->request->data)) {
 <?php if ($wannaUseSession): ?>
 				$this->Session->setFlash(__('The <?php echo strtolower($singularHumanName); ?> has been saved'));
 				$this->redirect(array('action' => 'index'));
@@ -72,16 +72,16 @@
 
 <?php $compact = array(); ?>
 	public function <?php echo $admin; ?>edit($id = null) {
-		if (!$id && empty($this->data)) {
+		if (!$id && empty($this->request->data)) {
 <?php if ($wannaUseSession): ?>
 			$this->Session->setFlash(__('Invalid <?php echo strtolower($singularHumanName); ?>'));
 			$this->redirect(array('action' => 'index'));
 <?php else: ?>
 			$this->flash(sprintf(__('Invalid <?php echo strtolower($singularHumanName); ?>')), array('action' => 'index'));
 <?php endif; ?>
 		}
-		if (!empty($this->data)) {
-			if ($this-><?php echo $currentModelName; ?>->save($this->data)) {
+		if ($this->request->is('post')) {
+			if ($this-><?php echo $currentModelName; ?>->save($this->request->data)) {
 <?php if ($wannaUseSession): ?>
 				$this->Session->setFlash(__('The <?php echo strtolower($singularHumanName); ?> has been saved'));
 				$this->redirect(array('action' => 'index'));
@@ -94,7 +94,7 @@
 <?php endif; ?>
 			}
 		}
-		if (empty($this->data)) {
+		if (!$this->request->is('post')) {
 			$this->data = $this-><?php echo $currentModelName; ?>->read(null, $id);
 		}
 <?php