From: moodler <moodler>
Date: Thu, 5 Aug 2004 18:13:59 +0000 (+0000)
Subject: Removed Martin's mistaken addition from a few days ago
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=19223525fae8f0cbba9f807c3f87d70c9bc0af5e;p=moodle.git

Removed Martin's mistaken addition from a few days ago
---

diff --git a/mod/resource/restorelib.php b/mod/resource/restorelib.php
index c4c377e3fb..1f8ce293ab 100644
--- a/mod/resource/restorelib.php
+++ b/mod/resource/restorelib.php
@@ -64,23 +64,6 @@
                 $oldtype = $resource->type;
                 $resource->type = $types[$oldtype];
                 $resource->options = $options[$oldtype];
-
-                //Finally, check some specific mimetypes to decide when to set the frame option
-                //making the restore smoother...:-)
-                require_once("$CFG->dirroot/files/mimetypes.php");
-                $embedded = false;
-                if ($resource->type == 'file' and !$resource->options and !$resource->popup) {
-                    $mimetype = mimeinfo("type", $resource->reference);
-                    if (in_array($mimetype, array('image/gif','image/jpeg','image/png'))
-                        or (substr($mimetype, 0, 10) == "video/x-ms")
-                        or ($mimetype == "audio/mp3")
-                        or ($mimetype == "video/quicktime")) {
-                        $embedded = true;
-                    }
-                    if (!$embedded) { 
-                        $resource->options = 'frame';
-                    }
-                }
             }
  
             //The structure is equal to the db, so insert the resource