From c1d7dc5f199be03d9f847d13c12b2ee49dc65be8 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Wed, 18 Mar 2009 02:12:07 +0000 Subject: 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 --- kohana/helpers/form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kohana/helpers') 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'; -- cgit v1.2.3