Skip to content
Snippets Groups Projects
Commit 773a2138 authored by catch's avatar catch
Browse files

Issue #3251625 by alexpott, Berdir: Including settings.php a second time and...

Issue #3251625 by alexpott, Berdir: Including settings.php a second time and without same context can result in errors
parent d21e5db7
No related branches found
No related tags found
No related merge requests found
......@@ -393,7 +393,7 @@ function system_requirements($phase) {
// Verify there are no database entries in settings.php with table prefix in
// array format.
if ($phase === 'runtime' || $phase === 'update') {
if (_system_check_array_table_prefixes(\Drupal::getContainer()->getParameter('app.root'), \Drupal::getContainer()->getParameter('site.path')) === TRUE) {
if (_system_check_array_table_prefixes() === TRUE) {
$requirements['database_table_prefixes'] = [
'title' => t('Database table prefixes'),
'value' => t("There is at least one database entry in the \$database array in settings.php that has a 'prefix' value in the format of an array. Per-table prefixes are no longer supported. Change your settings.php file to ensure the value of every 'prefix' entry is a single string."),
......@@ -1540,16 +1540,10 @@ function _system_advisories_requirements(array &$requirements): void {
/**
* Checks if there are 'prefix' entries in array format for tables.
*/
function _system_check_array_table_prefixes($app_root, $site_path) {
if (is_readable($app_root . '/' . $site_path . '/settings.php')) {
include $app_root . '/' . $site_path . '/settings.php';
}
if (empty($databases)) {
return FALSE;
}
foreach ($databases as $database) {
foreach ($database as $target) {
if (isset($target['prefix']) && is_array($target['prefix'])) {
function _system_check_array_table_prefixes() {
foreach (Database::getAllConnectionInfo() as $targets) {
foreach ($targets as $target) {
if (isset($target['extra_prefix']) && is_array($target['extra_prefix'])) {
return TRUE;
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment