golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't process wpdb->tables('global') inside a loop. props wpmuguru, fixes #14503. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18522 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2011-08-10 19:00:45 +00:00
parent c3c4ced486
commit 45f2e1a527
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/includes/upgrade.php
View File

@ -1406,9 +1406,10 @@ function dbDelta($queries, $execute = true) {
// Check to see which tables and fields exist
if ($tables = $wpdb->get_col('SHOW TABLES;')) {
// For every table in the database
$global_tables = $wpdb->tables( 'global' );
foreach ($tables as $table) {
// Upgrade global tables only for the main site. Don't upgrade at all if DO_NOT_UPGRADE_GLOBAL_TABLES is defined.
if ( in_array($table, $wpdb->tables('global')) && ( !is_main_site() || defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) )
if ( in_array( $table, $global_tables ) && ( !is_main_site() || defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) )
continue;
// If a table query exists for the database table...