- Patch #331171 by pwolanin, mfb, drewish: allow modules to alter the MIME extension mapping rather than setting a huge variable.

1 files changed, 4 insertions, 7 deletions

diff --git a/includes/stream_wrappers.inc b/includes/stream_wrappers.inc
index cb642d979..c58c58231 100644
--- a/includes/stream_wrappers.inc
+++ b/includes/stream_wrappers.inc
@@ -193,13 +193,10 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
    */
   static function getMimeType($uri, $mapping = NULL) {
     if (!isset($mapping)) {
-      $mapping = variable_get('mime_extension_mapping', NULL);
-      if (!isset($mapping)) {
-        include_once DRUPAL_ROOT . '/includes/file.mimetypes.inc';
-        // The default file map, defined in file.mimetypes.inc is quite big.
-        // We only load it when necessary.
-        $mapping = file_default_mimetype_mapping();
-      }
+      // The default file map, defined in file.mimetypes.inc is quite big.
+      // We only load it when necessary.
+      include_once DRUPAL_ROOT . '/includes/file.mimetypes.inc';
+      $mapping = file_mimetype_mapping();
     }
 
     $extension = '';