From c9d4fa645109b5af63f7d942a6b6071d2209b157 Mon Sep 17 00:00:00 2001
From: dho <dho@3807eeeb-6ff5-0310-8944-8be069107fe0>
Date: Fri, 13 Apr 2007 11:56:03 +0000
Subject: [PATCH] Applying patch from ticket #2417

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4856 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/view/helpers/form.php                  | 2 +-
 cake/tests/cases/libs/view/helpers/form.test.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index a894aab92..460c34ccd 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -462,7 +462,7 @@ class FormHelper extends AppHelper {
 				$out = $before . $out . $between . $this->{$type}($tagName, $options);
 			break;
 			case 'file':
-				$out = $before . $out . $between . $this->file($tagName);
+				$out = $before . $out . $between . $this->file($tagName, $options);
 			break;
 			case 'select':
 				$options = am(array('options' => array()), $options);
diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
index a4d8d7301..b920fac38 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -187,6 +187,9 @@ class FormHelperTest extends UnitTestCase {
 
 		$result = $this->Form->input('test', array('options' => array('First', 'Second'), 'empty' => true));
 		$this->assertPattern('/<select [^<>]+>\s+<option value=""\s*><\/option>\s+<option value="0"/', $result);
+		
+		$result = $this->Form->input('Model/field', array('type' => 'file', 'class' => 'textbox'));
+		$this->assertPattern('/class="textbox"/', $result);
 	}
 
 	function testLabel() {