summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2008-11-16 23:44:47 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2008-11-16 23:44:47 +0000
commitccd16b82a6ad62f3e2b00ca47e448be5571073fa (patch)
treece81a1eea177a2f061c63f06ab49ca35c66c8da8 /includes
parentb22a3c026d6f57122aa064cdb0c42006801ee3c8 (diff)
downloadbrdo-ccd16b82a6ad62f3e2b00ca47e448be5571073fa.tar.gz
brdo-ccd16b82a6ad62f3e2b00ca47e448be5571073fa.tar.bz2
#74645 follow-up by maartenvg: One very important file_scan_directory() call got missed; now HEAD installs again. W00t. ;)
Diffstat (limited to 'includes')
-rw-r--r--includes/install.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/install.inc b/includes/install.inc
index fc802011b..4bbd060b4 100644
--- a/includes/install.inc
+++ b/includes/install.inc
@@ -212,7 +212,7 @@ function drupal_detect_database_types() {
// Because we have no registry yet, we need to also include the install.inc
// file for the driver explicitly.
- foreach (file_scan_directory(DRUPAL_ROOT . '/includes/database', '/^[a-z]*$/i', array('.', '..', 'CVS'), 0, FALSE) as $file) {
+ foreach (file_scan_directory(DRUPAL_ROOT . '/includes/database', '/^[a-z]*$/i', '/(\.\.?|CVS)$/', 0, FALSE) as $file) {
include_once "{$file->filename}/install.inc";
include_once "{$file->filename}/database.inc";
$drivers[$file->basename] = $file->filename;