From 2d9ae75cae83969b3a708c0921ca33841ad08ef5 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Tue, 29 Aug 2017 15:48:19 -0400
Subject: [PATCH] Fix another bad merge issue?

---
 lib/galaxy/datatypes/data.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/galaxy/datatypes/data.py b/lib/galaxy/datatypes/data.py
index e8aa5c6b13b..d3a35c7e2bf 100644
--- a/lib/galaxy/datatypes/data.py
+++ b/lib/galaxy/datatypes/data.py
@@ -389,7 +389,7 @@ class Data(object):
                         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: