diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-03-18 02:12:07 +0000 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-03-18 02:12:07 +0000 |
| commit | c1d7dc5f199be03d9f847d13c12b2ee49dc65be8 (patch) | |
| tree | cf12bb7fec696cb36186a2214ad7931833320f84 /kohana/helpers/form.php | |
| parent | 6e84c132a2690984bf7fe73bfe758e2a8db4099f (diff) | |
Resolve deviation from the kohana code left aronud by r20297 and
r20301 (which was an unclean rollback of r20297) by just rolling them
both back:
$ svn merge -c-20301 kohana/helpers/form.php
$ svn merge -c-20297 kohana/helpers/form.php
Diffstat (limited to 'kohana/helpers/form.php')
| -rw-r--r-- | kohana/helpers/form.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kohana/helpers/form.php b/kohana/helpers/form.php index eeed10ab..0eaec0dc 100644 --- a/kohana/helpers/form.php +++ b/kohana/helpers/form.php @@ -24,7 +24,7 @@ class form_Core { // Make sure that the method is always set empty($attr['method']) and $attr['method'] = 'post'; - if ($attr['method'] !== 'post' and $attr['method'] !== 'get') + if ($attr['method'] !== 'post' AND $attr['method'] !== 'get') { // If the method is invalid, use post $attr['method'] = 'post'; |