Skip to content

Commit 10ce1b8

Browse files
Bootstrap/Load: Only override the $table_prefix global if not already defined.
This aims to provide more flexibility in preloading some environment settings before initializing WordPress. Follow-up to [18993], [57748]. Props ninos-ego, dd32, swissspidy, SergeyBiryukov. Fixes #63627. Built from https://develop.svn.wordpress.org/trunk@61250 git-svn-id: http://core.svn.wordpress.org/trunk@60562 1a063a9b-81f0-0310-95a4-ce76da25c4cd
1 parent 9152e42 commit 10ce1b8

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

wp-includes/version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
* @global string $wp_version
1818
*/
19-
$wp_version = '7.0-alpha-61249';
19+
$wp_version = '7.0-alpha-61250';
2020

2121
/**
2222
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

wp-settings.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,9 @@
140140
*
141141
* @global string $table_prefix The database table prefix.
142142
*/
143-
$GLOBALS['table_prefix'] = $table_prefix;
143+
if ( ! isset( $GLOBALS['table_prefix'] ) ) {
144+
$GLOBALS['table_prefix'] = $table_prefix;
145+
}
144146

145147
// Set the database table prefix and the format specifiers for database table columns.
146148
wp_set_wpdb_vars();

0 commit comments

Comments
 (0)