fix mime type again (controller sets invalid mime type, this needs to be overwritten), re #1

classes/MarketImage.class.php

@@ -45,7 +45,7 @@ class MarketImage extends SimpleORMap {
 
     public function outputImage() {
         $path = self::getImageDataPath() . "/" . $this->getId();
-        header("Content-Type: " . mime_content_type($path));
+        header("Content-Type: " . $this['mimetype']);
         header("Content-Disposition: inline; filename=" . $this['filename']);
         echo file_get_contents($path);
     }

controllers/myplugins.php

@@ -112,7 +112,7 @@ class MypluginsController extends PluginController {
                     $file = new MarketImage();
                     $file['plugin_id'] = $this->marketplugin->getId();
                     $file['filename'] = $name;
-                    $file['mimetype'] = $files['type'][$index];
+                    $file['mimetype'] = mime_content_type($files['tmp_name'][$index]);
                     $file['position'] = $position;
                     $file->installFromPath($files['tmp_name'][$index]);
                     $file->store();

controllers/presenting.php

@@ -155,7 +155,10 @@ class PresentingController extends PluginController {
 
     public function image_action($image_id) {
         $this->image = new MarketImage($image_id);
+
+        $this->set_content_type($this->image['mimetype']);
         $this->image->outputImage();
+
         $this->render_nothing();
     }