From 99ba3a26973848604719db08bbcafbfa82ca087f Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Fri, 15 Feb 2013 22:42:22 +0200
Subject: Fix #2247

---
 system/helpers/form_helper.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'system/helpers/form_helper.php')

diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index f343b6c71..d6e3e85fa 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -228,13 +228,10 @@ if ( ! function_exists('form_upload'))
 	 */
 	function form_upload($data = '', $value = '', $extra = '')
 	{
-		if ( ! is_array($data))
-		{
-			$data = array('name' => $data);
-		}
-
+		$default = array('type' => 'file', 'name' => '');
+		is_array($data) OR $data = array('name' => $data);
 		$data['type'] = 'file';
-		return form_input($data, $value, $extra);
+		return '<input '._parse_form_attributes($data, $defaults).$extra." />\n";
 	}
 }
 
-- 
cgit v1.2.3-24-g4f1b


From 06ddcf05c6861a908a0b3b57c6ba4a05bb82e10a Mon Sep 17 00:00:00 2001
From: Bo-Yi Wu <appleboy.tw@gmail.com>
Date: Mon, 18 Feb 2013 08:52:05 +0800
Subject: Fixed form helper variable error

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
---
 system/helpers/form_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/helpers/form_helper.php')

diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index d6e3e85fa..692909c79 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -228,7 +228,7 @@ if ( ! function_exists('form_upload'))
 	 */
 	function form_upload($data = '', $value = '', $extra = '')
 	{
-		$default = array('type' => 'file', 'name' => '');
+		$defaults = array('type' => 'file', 'name' => '');
 		is_array($data) OR $data = array('name' => $data);
 		$data['type'] = 'file';
 		return '<input '._parse_form_attributes($data, $defaults).$extra." />\n";
-- 
cgit v1.2.3-24-g4f1b