Fix #1208 remove double escape of '&' character from filename

This commit is contained in:
Kijin Sung 2019-11-22 20:28:39 +09:00
parent b158aeb9d5
commit 9694e5da14

View file

@ -1282,7 +1282,7 @@ class Context
unset($_FILES[$key]); unset($_FILES[$key]);
continue; continue;
} }
$val['name'] = escape($val['name'], false); $val['name'] = str_replace('&', '&', escape($val['name'], false));
self::set($key, $val, true); self::set($key, $val, true);
self::set('is_uploaded', true); self::set('is_uploaded', true);
self::$_instance->is_uploaded = true; self::$_instance->is_uploaded = true;
@ -1304,7 +1304,7 @@ class Context
break; break;
} }
$file = array(); $file = array();
$file['name'] = $val['name'][$i]; $file['name'] = str_replace('&', '&', escape($val['name'][$i], false));
$file['type'] = $val['type'][$i]; $file['type'] = $val['type'][$i];
$file['tmp_name'] = $val['tmp_name'][$i]; $file['tmp_name'] = $val['tmp_name'][$i];
$file['error'] = $val['error'][$i]; $file['error'] = $val['error'][$i];