![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png){kind=logo}
Changeset 47343 for branches/3.7/src
- Timestamp:
- 02/22/2020 12:05:12 PM (6 years ago)
- Location:
- branches/3.7
- Files:
-
- 6 edited
-
. (modified) (1 prop)
-
src (modified) (1 prop)
-
src/wp-admin/includes/upgrade.php (modified) (1 diff)
-
src/wp-includes/meta.php (modified) (1 diff)
-
src/wp-includes/ms-functions.php (modified) (2 diffs)
-
src/wp-includes/wp-db.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/3.7
- Property svn:mergeinfo changed
-
branches/3.7/src
- Property svn:mergeinfo changed
/trunk/src merged: 26252,26307,26512
- Property svn:mergeinfo changed
-
branches/3.7/src/wp-admin/includes/upgrade.php
r32435 r47343 1645 1645 1646 1646 // Fetch the table column structure from the database 1647 $ wpdb->suppress_errors();1647 $suppress = $wpdb->suppress_errors(); 1648 1648 $tablefields = $wpdb->get_results("DESCRIBE {$table};"); 1649 $wpdb->suppress_errors( false);1649 $wpdb->suppress_errors( $suppress ); 1650 1650 1651 1651 if ( ! $tablefields ) -
branches/3.7/src/wp-includes/meta.php
r25583 r47343 559 559 560 560 // Get meta info 561 $id_list = join( ',', $ids);562 $ meta_list = $wpdb->get_results( $wpdb->prepare("SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list)",563 $meta_type), ARRAY_A );561 $id_list = join( ',', $ids ); 562 $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id'; 563 $meta_list = $wpdb->get_results( "SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list) ORDER BY $id_column ASC", ARRAY_A ); 564 564 565 565 if ( !empty($meta_list) ) { -
branches/3.7/src/wp-includes/ms-functions.php
r39806 r47343 1131 1131 require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); 1132 1132 1133 $ wpdb->suppress_errors();1133 $suppress = $wpdb->suppress_errors(); 1134 1134 if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) ) 1135 1135 die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' ); 1136 $wpdb->suppress_errors( false);1136 $wpdb->suppress_errors( $suppress ); 1137 1137 1138 1138 $url = get_blogaddress_by_id( $blog_id ); … … 1181 1181 require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); 1182 1182 1183 $ wpdb->suppress_errors();1183 $suppress = $wpdb->suppress_errors(); 1184 1184 1185 1185 wp_install_defaults($user_id); 1186 1186 1187 $wpdb->suppress_errors( false);1187 $wpdb->suppress_errors( $suppress ); 1188 1188 } 1189 1189 -
branches/3.7/src/wp-includes/wp-db.php
r42241 r47343 1259 1259 1260 1260 if ( WP_DEBUG ) { 1261 $error_reporting = false; 1262 if ( defined( 'E_DEPRECATED' ) ) { 1263 $error_reporting = error_reporting(); 1264 error_reporting( $error_reporting ^ E_DEPRECATED ); 1265 } 1261 1266 $this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags ); 1267 if ( false !== $error_reporting ) { 1268 error_reporting( $error_reporting ); 1269 } 1262 1270 } else { 1263 1271 $this->dbh = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags );
Note:
See TracChangeset
for help on using the changeset viewer.
