From e63e85020b6846c35624f04c60b40f1aa11db3b1 Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Mon, 24 Aug 2009 00:10:46 +0000 Subject: Of all the patches to accidentally commit without a message. :( Rolling back registry rip. Let's try that again. --- includes/stream_wrappers.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'includes/stream_wrappers.inc') diff --git a/includes/stream_wrappers.inc b/includes/stream_wrappers.inc index cb642d979..6841325cc 100644 --- a/includes/stream_wrappers.inc +++ b/includes/stream_wrappers.inc @@ -194,8 +194,7 @@ 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'; + if (!isset($mapping) && drupal_function_exists('file_default_mimetype_mapping')) { // The default file map, defined in file.mimetypes.inc is quite big. // We only load it when necessary. $mapping = file_default_mimetype_mapping(); -- cgit v1.2.3