summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2010-01-17 08:23:00 +0100
committerDerek Allard <derek.allard@ellislab.com>2010-01-17 08:23:00 +0100
commit33d4b6aac7f33d6cddfa5fb39c5701ecc9cfa80b (patch)
tree326392a11e30731d6ba21d0fbc3a7156be05eab8
parent04eb070b87da9ffa40e48ef3660e664b48760c97 (diff)
adding the ability for form_open_multipart() to accept string attribute arguments
-rw-r--r--system/helpers/form_helper.php10
-rw-r--r--user_guide/changelog.html1
2 files changed, 10 insertions, 1 deletions
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index c78b805e5..60d2631e9 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -84,7 +84,15 @@ if ( ! function_exists('form_open_multipart'))
{
function form_open_multipart($action, $attributes = array(), $hidden = array())
{
- $attributes['enctype'] = 'multipart/form-data';
+ if (is_string($attributes))
+ {
+ $attributes .= ' enctype="multipart/form-data"';
+ }
+ else
+ {
+ $attributes['enctype'] = 'multipart/form-data';
+ }
+
return form_open($action, $attributes, $hidden);
}
}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index ba7ab2be7..92765c4e7 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -106,6 +106,7 @@ SVN Revision: </p>
<li>Fixed a bug where Active Record override parameter would not let you disable Active Record if it was enabled in your database config file.</li>
<li>Fixed a bug in reduce_double_slashes() in the String Helper to properly remove duplicate leading slashes (#7585)</li>
<li>Fixed a bug in values_parsing() of the XML-RPC library which prevented NULL variables typed as 'string' from being handled properly.</li>
+ <li>Fixed a bug were form_open_multipart() didn't accept string attribute arguments (#10930).</li>
</ul>
<h2>Version 1.7.2</h2>