From f98273f975d4f1b17967d893c0f28ff3ef41c51a Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@vortex.home>
Date: Sun, 16 Oct 2011 12:37:18 -0400
Subject: [PATCH] - Patch #1081266 by mfb: avoid re-scanning module directory
when multiple modules are missing.
---
includes/bootstrap.inc | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index bc5d5a326ebe..950587071325 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -850,7 +850,7 @@ function drupal_settings_initialize() {
function drupal_get_filename($type, $name, $filename = NULL) {
// The location of files will not change during the request, so do not use
// drupal_static().
- static $files = array();
+ static $files = array(), $dirs = array();
if (!isset($files[$type])) {
$files[$type] = array();
@@ -896,16 +896,19 @@ function drupal_get_filename($type, $name, $filename = NULL) {
$extension = $type;
}
- if (!function_exists('drupal_system_listing')) {
- require_once DRUPAL_ROOT . '/includes/common.inc';
- }
- // Scan the appropriate directories for all files with the requested
- // extension, not just the file we are currently looking for. This
- // prevents unnecessary scans from being repeated when this function is
- // called more than once in the same page request.
- $matches = drupal_system_listing("/^" . DRUPAL_PHP_FUNCTION_PATTERN . "\.$extension$/", $dir, 'name', 0);
- foreach ($matches as $matched_name => $file) {
- $files[$type][$matched_name] = $file->uri;
+ if (!isset($dirs[$dir][$extension])) {
+ $dirs[$dir][$extension] = TRUE;
+ if (!function_exists('drupal_system_listing')) {
+ require_once DRUPAL_ROOT . '/includes/common.inc';
+ }
+ // Scan the appropriate directories for all files with the requested
+ // extension, not just the file we are currently looking for. This
+ // prevents unnecessary scans from being repeated when this function is
+ // called more than once in the same page request.
+ $matches = drupal_system_listing("/^" . DRUPAL_PHP_FUNCTION_PATTERN . "\.$extension$/", $dir, 'name', 0);
+ foreach ($matches as $matched_name => $file) {
+ $files[$type][$matched_name] = $file->uri;
+ }
}
}
}
--
GitLab