diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-08-24 00:10:46 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-08-24 00:10:46 +0000 |
| commit | e63e85020b6846c35624f04c60b40f1aa11db3b1 (patch) | |
| tree | 908a1151a45ce37ae82dce00fffedb26b33ccde0 /includes/stream_wrappers.inc | |
| parent | 4ae238ea577ed0140df6fd034b06bfd7b0f0cdb4 (diff) | |
| download | brdo-e63e85020b6846c35624f04c60b40f1aa11db3b1.tar.gz brdo-e63e85020b6846c35624f04c60b40f1aa11db3b1.tar.bz2 | |
Of all the patches to accidentally commit without a message. :( Rolling back registry rip. Let's try that again.
Diffstat (limited to 'includes/stream_wrappers.inc')
| -rw-r--r-- | includes/stream_wrappers.inc | 3 |
1 files changed, 1 insertions, 2 deletions
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(); |