Change to using filename from basename

https://github.com/symphonycms/symphony-2/pull/1975

Swap `basename` for `filename` to avoid files having their extension added to their name on save: filename-jpg.jpg is created if `basename` is used.
Merge pull request #1987 from andrewminton/patch-1

Change to using filename from basename