set uploadName problem

[williamespindola]

If set option uploadName have problem in line 829 and line 851

original code:

// line 829
$saveAs = $options['dir'] . DS . $data[$model->alias][$options['uploadName']].'.'.$ext;

// line 851
$data[$model->alias][$fieldName] = $data[$model->alias][$options['uploadName']].'.'.$ext;

But this change works

// line 829
$saveAs = $options['dir'] . DS . $options['uploadName'].'.'.$ext;

// line 851
$data[$model->alias][$fieldName] = $options['uploadName'].'.'.$ext;

Sorry my english is not verry good :)