X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/4feeb71a9d812a9ae371c28a3d8b442a4394ded7..607b7e02d77e7326161e8ec15639052d2040f745:/wp-admin/includes/upgrade.php
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 3ddbc8b1..807673a7 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -38,7 +38,7 @@ if ( !function_exists('wp_install') ) :
*/
function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '' ) {
if ( !empty( $deprecated ) )
- _deprecated_argument( __FUNCTION__, '2.6' );
+ _deprecated_argument( __FUNCTION__, '2.6.0' );
wp_check_mysql_version();
wp_cache_flush();
@@ -191,19 +191,22 @@ function wp_install_defaults( $user_id ) {
$wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1) );
// Default comment
- $first_comment_author = __('Mr WordPress');
+ $first_comment_author = __( 'A WordPress Commenter' );
+ $first_comment_email = 'wapuu@wordpress.example';
$first_comment_url = 'https://wordpress.org/';
- $first_comment = __('Hi, this is a comment.
-To delete a comment, just log in and view the post's comments. There you will have the option to edit or delete them.');
+ $first_comment = __( 'Hi, this is a comment.
+To get started with moderating, editing, and deleting comments, please visit the Comments screen in the dashboard.
+Commenter avatars come from Gravatar.' );
if ( is_multisite() ) {
$first_comment_author = get_site_option( 'first_comment_author', $first_comment_author );
+ $first_comment_email = get_site_option( 'first_comment_email', $first_comment_email );
$first_comment_url = get_site_option( 'first_comment_url', network_home_url() );
$first_comment = get_site_option( 'first_comment', $first_comment );
}
$wpdb->insert( $wpdb->comments, array(
'comment_post_ID' => 1,
'comment_author' => $first_comment_author,
- 'comment_author_email' => '',
+ 'comment_author_email' => $first_comment_email,
'comment_author_url' => $first_comment_url,
'comment_date' => $now,
'comment_date_gmt' => $now_gmt,
@@ -317,11 +320,12 @@ function wp_install_maybe_enable_pretty_permalinks() {
*/
$wp_rewrite->flush_rules( true );
- // Test against a real WordPress Post, or if none were created, a random 404 page.
- $test_url = get_permalink( 1 );
+ $test_url = '';
- if ( ! $test_url ) {
- $test_url = home_url( '/wordpress-check-for-rewrites/' );
+ // Test against a real WordPress Post
+ $first_post = get_page_by_path( sanitize_title( _x( 'hello-world', 'Default post slug' ) ), OBJECT, 'post' );
+ if ( $first_post ) {
+ $test_url = get_permalink( $first_post->ID );
}
/*
@@ -552,6 +556,9 @@ function upgrade_all() {
if ( $wp_current_db_version < 36686 )
upgrade_450();
+ if ( $wp_current_db_version < 37965 )
+ upgrade_460();
+
maybe_disable_link_manager();
maybe_disable_automattic_widgets();
@@ -1687,6 +1694,38 @@ function upgrade_450() {
delete_user_setting( 'wplink' );
}
+/**
+ * Executes changes made in WordPress 4.6.0.
+ *
+ * @ignore
+ * @since 4.6.0
+ *
+ * @global int $wp_current_db_version Current database version.
+ */
+function upgrade_460() {
+ global $wp_current_db_version;
+
+ // Remove unused post meta.
+ if ( $wp_current_db_version < 37854 ) {
+ delete_post_meta_by_key( '_post_restored_from' );
+ }
+
+ // Remove plugins with callback as an array object/method as the uninstall hook, see #13786.
+ if ( $wp_current_db_version < 37965 ) {
+ $uninstall_plugins = get_option( 'uninstall_plugins', array() );
+
+ if ( ! empty( $uninstall_plugins ) ) {
+ foreach ( $uninstall_plugins as $basename => $callback ) {
+ if ( is_array( $callback ) && is_object( $callback[0] ) ) {
+ unset( $uninstall_plugins[ $basename ] );
+ }
+ }
+
+ update_option( 'uninstall_plugins', $uninstall_plugins );
+ }
+ }
+}
+
/**
* Executes network-level upgrade routines.
*
@@ -2104,7 +2143,7 @@ function dbDelta( $queries = '', $execute = true ) {
}
/**
- * Filter the dbDelta SQL queries.
+ * Filters the dbDelta SQL queries.
*
* @since 3.3.0
*
@@ -2133,7 +2172,7 @@ function dbDelta( $queries = '', $execute = true ) {
}
/**
- * Filter the dbDelta SQL queries for creating tables and/or databases.
+ * Filters the dbDelta SQL queries for creating tables and/or databases.
*
* Queries filterable via this hook contain "CREATE TABLE" or "CREATE DATABASE".
*
@@ -2144,7 +2183,7 @@ function dbDelta( $queries = '', $execute = true ) {
$cqueries = apply_filters( 'dbdelta_create_queries', $cqueries );
/**
- * Filter the dbDelta SQL queries for inserting or updating.
+ * Filters the dbDelta SQL queries for inserting or updating.
*
* Queries filterable via this hook contain "INSERT INTO" or "UPDATE".
*
@@ -2183,83 +2222,168 @@ function dbDelta( $queries = '', $execute = true ) {
// Separate field lines into an array.
$flds = explode("\n", $qryline);
- // todo: Remove this?
- //echo "
\n".print_r(strtolower($table), true).":\n".print_r($cqueries, true)."
";
-
// For every field line specified in the query.
- foreach ($flds as $fld) {
+ foreach ( $flds as $fld ) {
+ $fld = trim( $fld, " \t\n\r\0\x0B," ); // Default trim characters, plus ','.
// Extract the field name.
- preg_match("|^([^ ]*)|", trim($fld), $fvals);
+ preg_match( '|^([^ ]*)|', $fld, $fvals );
$fieldname = trim( $fvals[1], '`' );
+ $fieldname_lowercased = strtolower( $fieldname );
// Verify the found field name.
$validfield = true;
- switch (strtolower($fieldname)) {
- case '':
- case 'primary':
- case 'index':
- case 'fulltext':
- case 'unique':
- case 'key':
- $validfield = false;
- $indices[] = trim(trim($fld), ", \n");
- break;
+ switch ( $fieldname_lowercased ) {
+ case '':
+ case 'primary':
+ case 'index':
+ case 'fulltext':
+ case 'unique':
+ case 'key':
+ case 'spatial':
+ $validfield = false;
+
+ /*
+ * Normalize the index definition.
+ *
+ * This is done so the definition can be compared against the result of a
+ * `SHOW INDEX FROM $table_name` query which returns the current table
+ * index information.
+ */
+
+ // Extract type, name and columns from the definition.
+ preg_match(
+ '/^'
+ . '(?P' // 1) Type of the index.
+ . 'PRIMARY\s+KEY|(?:UNIQUE|FULLTEXT|SPATIAL)\s+(?:KEY|INDEX)|KEY|INDEX'
+ . ')'
+ . '\s+' // Followed by at least one white space character.
+ . '(?:' // Name of the index. Optional if type is PRIMARY KEY.
+ . '`?' // Name can be escaped with a backtick.
+ . '(?P' // 2) Name of the index.
+ . '(?:[0-9a-zA-Z$_-]|[\xC2-\xDF][\x80-\xBF])+'
+ . ')'
+ . '`?' // Name can be escaped with a backtick.
+ . '\s+' // Followed by at least one white space character.
+ . ')*'
+ . '\(' // Opening bracket for the columns.
+ . '(?P'
+ . '.+?' // 3) Column names, index prefixes, and orders.
+ . ')'
+ . '\)' // Closing bracket for the columns.
+ . '$/im',
+ $fld,
+ $index_matches
+ );
+
+ // Uppercase the index type and normalize space characters.
+ $index_type = strtoupper( preg_replace( '/\s+/', ' ', trim( $index_matches['index_type'] ) ) );
+
+ // 'INDEX' is a synonym for 'KEY', standardize on 'KEY'.
+ $index_type = str_replace( 'INDEX', 'KEY', $index_type );
+
+ // Escape the index name with backticks. An index for a primary key has no name.
+ $index_name = ( 'PRIMARY KEY' === $index_type ) ? '' : '`' . $index_matches['index_name'] . '`';
+
+ // Parse the columns. Multiple columns are separated by a comma.
+ $index_columns = array_map( 'trim', explode( ',', $index_matches['index_columns'] ) );
+
+ // Normalize columns.
+ foreach ( $index_columns as &$index_column ) {
+ // Extract column name and number of indexed characters (sub_part).
+ preg_match(
+ '/'
+ . '`?' // Name can be escaped with a backtick.
+ . '(?P' // 1) Name of the column.
+ . '(?:[0-9a-zA-Z$_-]|[\xC2-\xDF][\x80-\xBF])+'
+ . ')'
+ . '`?' // Name can be escaped with a backtick.
+ . '(?:' // Optional sub part.
+ . '\s*' // Optional white space character between name and opening bracket.
+ . '\(' // Opening bracket for the sub part.
+ . '\s*' // Optional white space character after opening bracket.
+ . '(?P'
+ . '\d+' // 2) Number of indexed characters.
+ . ')'
+ . '\s*' // Optional white space character before closing bracket.
+ . '\)' // Closing bracket for the sub part.
+ . ')?'
+ . '/',
+ $index_column,
+ $index_column_matches
+ );
+
+ // Escape the column name with backticks.
+ $index_column = '`' . $index_column_matches['column_name'] . '`';
+
+ // Append the optional sup part with the number of indexed characters.
+ if ( isset( $index_column_matches['sub_part'] ) ) {
+ $index_column .= '(' . $index_column_matches['sub_part'] . ')';
+ }
+ }
+
+ // Build the normalized index definition and add it to the list of indices.
+ $indices[] = "{$index_type} {$index_name} (" . implode( ',', $index_columns ) . ")";
+
+ // Destroy no longer needed variables.
+ unset( $index_column, $index_column_matches, $index_matches, $index_type, $index_name, $index_columns );
+
+ break;
}
- $fld = trim($fld);
// If it's a valid field, add it to the field array.
- if ($validfield) {
- $cfields[strtolower($fieldname)] = trim($fld, ", \n");
+ if ( $validfield ) {
+ $cfields[ $fieldname_lowercased ] = $fld;
}
}
// For every field in the table.
- foreach ($tablefields as $tablefield) {
+ foreach ( $tablefields as $tablefield ) {
+ $tablefield_field_lowercased = strtolower( $tablefield->Field );
+ $tablefield_type_lowercased = strtolower( $tablefield->Type );
// If the table field exists in the field array ...
- if (array_key_exists(strtolower($tablefield->Field), $cfields)) {
+ if ( array_key_exists( $tablefield_field_lowercased, $cfields ) ) {
// Get the field type from the query.
- preg_match("|".$tablefield->Field." ([^ ]*( unsigned)?)|i", $cfields[strtolower($tablefield->Field)], $matches);
+ preg_match( '|`?' . $tablefield->Field . '`? ([^ ]*( unsigned)?)|i', $cfields[ $tablefield_field_lowercased ], $matches );
$fieldtype = $matches[1];
+ $fieldtype_lowercased = strtolower( $fieldtype );
// Is actual field type different from the field type in query?
if ($tablefield->Type != $fieldtype) {
$do_change = true;
- if ( in_array( strtolower( $fieldtype ), $text_fields ) && in_array( strtolower( $tablefield->Type ), $text_fields ) ) {
- if ( array_search( strtolower( $fieldtype ), $text_fields ) < array_search( strtolower( $tablefield->Type ), $text_fields ) ) {
+ if ( in_array( $fieldtype_lowercased, $text_fields ) && in_array( $tablefield_type_lowercased, $text_fields ) ) {
+ if ( array_search( $fieldtype_lowercased, $text_fields ) < array_search( $tablefield_type_lowercased, $text_fields ) ) {
$do_change = false;
}
}
- if ( in_array( strtolower( $fieldtype ), $blob_fields ) && in_array( strtolower( $tablefield->Type ), $blob_fields ) ) {
- if ( array_search( strtolower( $fieldtype ), $blob_fields ) < array_search( strtolower( $tablefield->Type ), $blob_fields ) ) {
+ if ( in_array( $fieldtype_lowercased, $blob_fields ) && in_array( $tablefield_type_lowercased, $blob_fields ) ) {
+ if ( array_search( $fieldtype_lowercased, $blob_fields ) < array_search( $tablefield_type_lowercased, $blob_fields ) ) {
$do_change = false;
}
}
if ( $do_change ) {
- // Add a query to change the column type
- $cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN {$tablefield->Field} " . $cfields[strtolower($tablefield->Field)];
+ // Add a query to change the column type.
+ $cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN `{$tablefield->Field}` " . $cfields[ $tablefield_field_lowercased ];
$for_update[$table.'.'.$tablefield->Field] = "Changed type of {$table}.{$tablefield->Field} from {$tablefield->Type} to {$fieldtype}";
}
}
- // Get the default value from the array
- // todo: Remove this?
- //echo "{$cfields[strtolower($tablefield->Field)]}
";
- if (preg_match("| DEFAULT '(.*?)'|i", $cfields[strtolower($tablefield->Field)], $matches)) {
+ // Get the default value from the array.
+ if ( preg_match( "| DEFAULT '(.*?)'|i", $cfields[ $tablefield_field_lowercased ], $matches ) ) {
$default_value = $matches[1];
if ($tablefield->Default != $default_value) {
// Add a query to change the column's default value
- $cqueries[] = "ALTER TABLE {$table} ALTER COLUMN {$tablefield->Field} SET DEFAULT '{$default_value}'";
+ $cqueries[] = "ALTER TABLE {$table} ALTER COLUMN `{$tablefield->Field}` SET DEFAULT '{$default_value}'";
$for_update[$table.'.'.$tablefield->Field] = "Changed default value of {$table}.{$tablefield->Field} from {$tablefield->Default} to {$default_value}";
}
}
// Remove the field from the array (so it's not added).
- unset($cfields[strtolower($tablefield->Field)]);
+ unset( $cfields[ $tablefield_field_lowercased ] );
} else {
// This field exists in the table, but not in the creation queries?
}
@@ -2302,18 +2426,23 @@ function dbDelta( $queries = '', $execute = true ) {
if ( 'FULLTEXT' === strtoupper( $index_data['index_type'] ) ) {
$index_string .= 'FULLTEXT ';
}
+ if ( 'SPATIAL' === strtoupper( $index_data['index_type'] ) ) {
+ $index_string .= 'SPATIAL ';
+ }
$index_string .= 'KEY ';
- if ($index_name != 'PRIMARY') {
- $index_string .= $index_name;
+ if ( 'PRIMARY' !== $index_name ) {
+ $index_string .= '`' . $index_name . '`';
}
$index_columns = '';
// For each column in the index.
foreach ($index_data['columns'] as $column_data) {
- if ($index_columns != '') $index_columns .= ',';
+ if ( $index_columns != '' ) {
+ $index_columns .= ',';
+ }
// Add the field to the column list string.
- $index_columns .= $column_data['fieldname'];
+ $index_columns .= '`' . $column_data['fieldname'] . '`';
if ($column_data['subpart'] != '') {
$index_columns .= '('.$column_data['subpart'].')';
}
@@ -2332,12 +2461,8 @@ function dbDelta( $queries = '', $execute = true ) {
if ( ! ( ( $aindex = array_search( $index_string, $indices ) ) === false ) ) {
unset( $indices[ $aindex ] );
break;
- // todo: Remove this?
- //echo "{$table}:
Found index:".$index_string."\n";
}
}
- // todo: Remove this?
- //else echo "{$table}:
Did not find index:".$index_string."
".print_r($indices, true)."\n";
}
}
@@ -2355,8 +2480,6 @@ function dbDelta( $queries = '', $execute = true ) {
$allqueries = array_merge($cqueries, $iqueries);
if ($execute) {
foreach ($allqueries as $query) {
- // todo: Remove this?
- //echo "".print_r($query, true)."
\n";
$wpdb->query($query);
}
}
@@ -2800,7 +2923,7 @@ function wp_should_upgrade_global_tables() {
}
/**
- * Filter if upgrade routines should be run on global tables.
+ * Filters if upgrade routines should be run on global tables.
*
* @param bool $should_upgrade Whether to run the upgrade routines on global tables.
*/