summaryrefslogtreecommitdiff
path: root/includes/stream_wrappers.inc
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-08-24 00:14:23 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-08-24 00:14:23 +0000
commit2c552193154dd49a335b883019e216430a097790 (patch)
tree0105ac8012cddcf8f4f2b63a27f66d0457dfd5cd /includes/stream_wrappers.inc
parent00280ca9885a668dd28831cacd536d11f98df36f (diff)
downloadbrdo-2c552193154dd49a335b883019e216430a097790.tar.gz
brdo-2c552193154dd49a335b883019e216430a097790.tar.bz2
#497118 by chx, catch, pwolanin, JoshuaRogers, and Jacob Singh: Remove the function registry. While the hope was that this would result in improved performance for low-end hosts, it comes at the expense of critical development experience problems and less benefit than something like APC. Class registry remains intact to facilitate autoloading.
Diffstat (limited to 'includes/stream_wrappers.inc')
-rw-r--r--includes/stream_wrappers.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/stream_wrappers.inc b/includes/stream_wrappers.inc
index 6841325cc..cb642d979 100644
--- a/includes/stream_wrappers.inc
+++ b/includes/stream_wrappers.inc
@@ -194,7 +194,8 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
static function getMimeType($uri, $mapping = NULL) {
if (!isset($mapping)) {
$mapping = variable_get('mime_extension_mapping', NULL);
- if (!isset($mapping) && drupal_function_exists('file_default_mimetype_mapping')) {
+ 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();