Merge remote branch 'aurelijus/filefield_original_name'

* aurelijus/filefield_original_name:
  get originalName before move call
This commit is contained in:
Fabien Potencier 2011-03-24 10:01:03 +01:00
commit faf72269dd

View File

@ -88,9 +88,9 @@ class FileField extends Form
throw new FormException('A PHP extension stopped the file upload (UPLOAD_ERR_EXTENSION)');
case UPLOAD_ERR_OK:
default:
$data['original_name'] = $data['file']->getName();
$data['file']->move($this->getTmpDir());
$data['file']->rename($this->getTmpName($data['token']));
$data['original_name'] = $data['file']->getName();
$data['file'] = '';
break;
}