Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Commit d9183d7

Browse files
aweingartengrasmash
authored andcommitted
Replaced require with require_once in settings.php and blt.settings.php to protect against double includes. (#298)
1 parent 6bb87da commit d9183d7

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

template/docroot/sites/default/settings.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -700,4 +700,4 @@
700700
*/
701701

702702
// Include BLT configuration.
703-
require DRUPAL_ROOT . '/sites/default/settings/blt.settings.php';
703+
require_once DRUPAL_ROOT . '/sites/default/settings/blt.settings.php';
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
<?php
22

33
// Includes required Acquia configuration and set $base_url correctly.
4-
require DRUPAL_ROOT . '/sites/default/settings/base.settings.php';
4+
require_once DRUPAL_ROOT . '/sites/default/settings/base.settings.php';
55

66
// Includes caching configuration.
7-
require DRUPAL_ROOT . '/sites/default/settings/cache.settings.php';
7+
require_once DRUPAL_ROOT . '/sites/default/settings/cache.settings.php';
88

99
// Includes logging configuration.
10-
require DRUPAL_ROOT . '/sites/default/settings/logging.settings.php';
10+
require_once DRUPAL_ROOT . '/sites/default/settings/logging.settings.php';
1111

1212

1313
/**
1414
* Acquia Cloud settings.
1515
*/
1616
if ($is_ah_env && file_exists('/var/www/site-php')) {
17-
require "/var/www/site-php/{$_ENV['AH_SITE_GROUP']}/{$_ENV['AH_SITE_GROUP']}-settings.inc";
17+
require_once "/var/www/site-php/{$_ENV['AH_SITE_GROUP']}/{$_ENV['AH_SITE_GROUP']}-settings.inc";
1818

1919
// Store API Keys and things outside of version control.
2020
// @see settings/sample-secrets.settings.php for sample code.
2121
$secrets_file = sprintf('/mnt/gfs/%s.%s/secrets.settings.php', $_ENV['AH_SITE_GROUP'], $_ENV['AH_SITE_ENVIRONMENT']);
2222
if (file_exists($secrets_file)) {
23-
require $secrets_file;
23+
require_once $secrets_file;
2424
}
2525
}
2626

@@ -37,19 +37,19 @@
3737
if ($is_local_env) {
3838
// Load Dev Desktop settings.
3939
if (isset($_SERVER['DEVDESKTOP_DRUPAL_SETTINGS_DIR']) && file_exists($_SERVER['DEVDESKTOP_DRUPAL_SETTINGS_DIR'] . '/loc_${project.machine_name}_dd.inc')) {
40-
require $_SERVER['DEVDESKTOP_DRUPAL_SETTINGS_DIR'] . '/loc_${project.machine_name}_dd.inc';
40+
require_once $_SERVER['DEVDESKTOP_DRUPAL_SETTINGS_DIR'] . '/loc_${project.machine_name}_dd.inc';
4141
}
4242
// Load local machine settings.
4343
elseif (file_exists(DRUPAL_ROOT . '/sites/default/settings/local.settings.php')) {
44-
require DRUPAL_ROOT . '/sites/default/settings/local.settings.php';
44+
require_once DRUPAL_ROOT . '/sites/default/settings/local.settings.php';
4545
}
4646

4747
// Load Travis CI settings.
4848
if (getenv('TRAVIS') && file_exists(DRUPAL_ROOT . '/sites/default/settings/travis.settings.php')) {
49-
require DRUPAL_ROOT . '/sites/default/settings/travis.settings.php';
49+
require_once DRUPAL_ROOT . '/sites/default/settings/travis.settings.php';
5050
}
5151
// Load Tugboat settings.
5252
elseif (getenv('TUGBOAT_URL') && file_exists(DRUPAL_ROOT . '/sites/default/settings/tugboat.settings.php')) {
53-
require DRUPAL_ROOT . '/sites/default/settings/tugboat.settings.php';
53+
require_once DRUPAL_ROOT . '/sites/default/settings/tugboat.settings.php';
5454
}
5555
}

template/docroot/sites/default/settings/readme.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
This directory contains modularized settings files. The are "required" into
44
a Drupal installation's sites/default/settings.php in the follow manner
55

6-
require '../all/settings/base.settings.php';
7-
require '../all/settings/cache.settings.php';
6+
require_once '../all/settings/base.settings.php';
7+
require_once '../all/settings/cache.settings.php';
88
// etc...

0 commit comments

Comments
 (0)