download image doesn't display now

diff --git a/actions/download.php b/actions/download.php
index fd23a21a7b2ac3816f50d5e3bec0da1bd309ba3d..3b39c831d836ae107c57959efa0d30a417e94be1 100644 (file)
--- a/actions/download.php
+++ b/actions/download.php
@@ -8,27 +8,22 @@
 \r
        $file_guid = (int) get_input("file_guid");\r
        $file = get_entity($file_guid);\r
-               \r
-       if ($file)\r
-       {       \r
+       \r
+       if ($file) {\r
                $filename = $file->originalfilename;\r
                $mime = $file->mimetype;\r
                \r
                header("Content-type: $mime");\r
-               if (strpos($mime, "image/")!==false)\r
-                       header("Content-Disposition: inline; filename=\"$filename\"");\r
-               else\r
-                       header("Content-Disposition: attachment; filename=\"$filename\"");\r
+               header("Content-Disposition: attachment; filename=\"$filename\"");\r
 \r
-                       \r
+               \r
                $readfile = new ElggFile($file_guid);\r
                $readfile->owner_guid = $file->owner_guid;\r
-               //$readfile->setFilename($filename);\r
-                       \r
+               \r
                $contents = $readfile->grabFile();\r
                \r
                if (empty($contents))\r
-                       echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/icons/general.jpg" );\r
+                       echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/image_error_large.png" );\r
                else\r
                        echo $contents;\r
                \r