Fixing extra td; Issue #1374 #1428

Closed
wants to merge 3 commits into
from
@@ -247,7 +247,7 @@ protected function _prep_args($args)
{
foreach ($args[0] as $key => $val)
{
- $args[$key] = (is_array($val) && isset($val['data'])) ? $val : array('data' => $val);
+ $ret_args[$key] = (is_array($val) && isset($val['data'])) ? $val : array('data' => $val);
}
}
}
@@ -257,12 +257,12 @@ protected function _prep_args($args)
{
if ( ! is_array($val))
{
- $args[$key] = array('data' => $val);
+ $ret_args[$key] = array('data' => $val);
}
}
}
- return $args;
+ return $ret_args;
}
// --------------------------------------------------------------------
@@ -197,6 +197,7 @@ Preference Default Value Options Descripti
Separate multiple types with a pipe.
**file_name** None Desired file name If set CodeIgniter will rename the uploaded file to this name. The
extension provided in the file name must also be an allowed file type.
+ If no extension is provided in the original file_name will be used.
**overwrite** FALSE TRUE/FALSE (boolean) If set to true, if a file with the same name as the one you are
uploading exists, it will be overwritten. If set to false, a number will
be appended to the filename if another with the same name exists.
@@ -65,8 +65,7 @@ format_characters()
This function is similar to the auto_typography function above, except
that it only does character conversion:
-- Quotes are converted to correctly facing curly quote entities, except
- those that appear within tags.
+- Quotes are converted to correctly facing curly quote entities.
- Apostrophes are converted to curly apostrophe entities.
- Double dashes (either like -- this or like--this) are converted to
em—dashes.