use directory from original instead of current dir
Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs

fix thumbnail generation for subdirectories in the conflicts dialog