summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorGreg Aker <greg@gregaker.net>2011-08-21 05:15:49 +0200
committerGreg Aker <greg@gregaker.net>2011-08-21 05:15:49 +0200
commit020f754c59df5aea5c2834b23e92527774d8e917 (patch)
treed1f58f1cc3e97c8cbc5d976ebbe75191d0a93a63 /system
parent9bcc40451f76737f787a3f7afc0fdab4842c9305 (diff)
parent30c9289d501e840828093fd6c2e595fd25296326 (diff)
Merge branch 'resolve_issue_65' of https://github.com/benedmunds/CodeIgniter into benedmunds-resolve_issue_65
Conflicts: user_guide/changelog.html
Diffstat (limited to 'system')
-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 47f93e748..d9305c00b 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -94,7 +94,7 @@ if ( ! function_exists('form_open'))
*/
if ( ! function_exists('form_open_multipart'))
{
- function form_open_multipart($action, $attributes = array(), $hidden = array())
+ function form_open_multipart($action = '', $attributes = array(), $hidden = array())
{
if (is_string($attributes))
{