summaryrefslogtreecommitdiffstats
path: root/system/helpers/form_helper.php
diff options
context:
space:
mode:
authorDavid Barratt <david@davidwbarratt.com>2013-02-18 23:57:51 +0100
committerDavid Barratt <david@davidwbarratt.com>2013-02-18 23:57:51 +0100
commita0afc3aafad9552d5f8763fdc6f635b5b683d8b6 (patch)
tree3fe2b8717a2057564ebdb331e89edc8ba4445259 /system/helpers/form_helper.php
parentb2834114746585b60a490992a02c1b136363e791 (diff)
parent6244086d6e251fc4b3c71d23da625ffb59b85d77 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/helpers/form_helper.php')
-rw-r--r--system/helpers/form_helper.php2
1 files changed, 1 insertions, 1 deletions
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";