Fix another bad merge issue?

galaxyproject · Aug 29, 2017 · 2d9ae75 · 2d9ae75
1 parent d56fcf6
commit 2d9ae75
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/galaxy/datatypes/data.py b/lib/galaxy/datatypes/data.py
@@ -389,7 +389,7 @@ def display_data(self, trans, data, preview=False, filename=None, to_ext=None, *
                         tmp_fh.write('<tr bgcolor="%s"><td>%s</td></tr>\n' % (bgcolor, escape(fname)))
                     tmp_fh.write('</table></body></html>\n')
                     tmp_fh.close()
-                    return self._yield_user_file_content(trans, data, file_path)
+                    return self._yield_user_file_content(trans, data, tmp_file_name)
                 mime = mimetypes.guess_type(file_path)[0]
                 if not mime:
                     try: