From 1db295f3669e0189fae6703b478d55b7ebc92e25 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Mon, 21 May 2007 04:27:42 +0000
Subject: [PATCH] Adding patch from #2610, fixes Scaffold plugin produces
incorrect form "action"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5142 3807eeeb-6ff5-0310-8944-8be069107fe0
---
cake/libs/view/helpers/form.php | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 0a78eaced..7424b1a67 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -142,9 +142,7 @@ class FormHelper extends AppHelper {
if (empty($options['url']) || is_array($options['url'])) {
$options = (array)$options;
- if(!empty($this->plugin)) {
- $controller = $this->plugin;
- } elseif (!empty($model) && $model != $defaultModel) {
+ if (!empty($model) && $model != $defaultModel) {
$controller = Inflector::underscore(Inflector::pluralize($model));
} else {
$controller = Inflector::underscore($this->params['controller']);
@@ -154,6 +152,7 @@ class FormHelper extends AppHelper {
}
$actionDefaults = array(
+ 'plugin' => $this->plugin,
'controller' => $controller,
'action' => $options['action'],
'id' => $id
@@ -1179,4 +1178,4 @@ class FormHelper extends AppHelper {
return $this->__options[$name];
}
}
-?>
\ No newline at end of file
+?>