adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding fix for Ticket #2353

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4795 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-04-05 21:20:08 +00:00
parent 1ad04a6558
commit 69da631d61
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cake/libs/view/helpers/form.php
View file

@ -57,9 +57,9 @@
class FormHelper extends AppHelper {
var $helpers = array('Html');
/**
* holds the fields array('field_name'=>'type'), sizes array('field_name'=>'size'),
* holds the fields array('field_name'=>'type'), sizes array('field_name'=>'size'),
* primaryKey and validates array('field_name')
*
* @access public
@ -188,7 +188,9 @@ class FormHelper extends AppHelper {
$htmlAttributes = am($options, $htmlAttributes);
if (isset($this->params['_Token']) && !empty($this->params['_Token'])) {
$append .= $this->hidden('_Token/key', array('value' => $this->params['_Token']['key'], 'id' => $options['id'] . 'Token'));
$append .= '<p style="display: inline; margin: 0px; padding: 0px;">';
$append .= $this->hidden('_Token/key', array('value' => $this->params['_Token']['key'], 'id' => $options['id'] . 'Token' . mt_rand()));
$append .= '</p>';
}
$this->setFormTag($model . '.');
@ -287,8 +289,8 @@ class FormHelper extends AppHelper {
function inputs($fields = null, $blacklist = null) {
if(!is_array($fields)) {
$fields = array_keys($this->fieldset['fields']);
}
}
$out = null;
foreach($fields as $name => $options) {
if(is_array($blacklist) && in_array($name, $blacklist)) {
@ -378,9 +380,9 @@ class FormHelper extends AppHelper {
$div = $options['div'];
unset($options['div']);
}
if(!empty($div)) {
$divOptions = array('class'=>'input');
$divOptions = array('class'=>'input');
if (is_string($div)) {
$divOptions['class'] = $div;
} elseif (is_array($div)) {
@ -388,9 +390,9 @@ class FormHelper extends AppHelper {
}
if (in_array($this->field(), $this->fieldset['validates'])) {
$divOptions = $this->addClass($divOptions, 'required');
}
}
}
$label = null;
if (isset($options['label'])) {
$label = $options['label'];
@ -1338,4 +1340,4 @@ class FormHelper extends AppHelper {
}
}
?>
?>

8
cake/libs/view/helpers/html.php
View file

@ -709,13 +709,15 @@ class HtmlHelper extends AppHelper {
$htmlAttributes['action'] = $this->url($target);
$htmlAttributes['method'] = low($type) == 'get' ? 'get' : 'post';
$type == 'file' ? $htmlAttributes['enctype'] = 'multipart/form-data' : null;
$token = '';
$append = '';
if (isset($this->params['_Token']) && !empty($this->params['_Token'])) {
$token = $this->hidden('_Token/key', array('value' => $this->params['_Token']['key']), true);
$append .= '<p style="display: inline; margin: 0px; padding: 0px;">';
$append .= $this->hidden('_Token/key', array('value' => $this->params['_Token']['key'], 'id' => '_TokenKey' . mt_rand()), true);
$append .= '</p>';
}
return sprintf($this->tags['form'], $this->parseHtmlOptions($htmlAttributes, null, '')) . $token;
return sprintf($this->tags['form'], $this->parseHtmlOptions($htmlAttributes, null, '')) . $append;
}
/**
* @deprecated