rebase on oct-10-2023
This commit is contained in:
@@ -351,7 +351,7 @@ Commenter avatars come from <a href="%s">Gravatar</a>.'
|
||||
$privacy_policy_content = get_site_option( 'default_privacy_policy_content' );
|
||||
} else {
|
||||
if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {
|
||||
include_once ABSPATH . 'wp-admin/includes/class-wp-privacy-policy-content.php';
|
||||
require_once ABSPATH . 'wp-admin/includes/class-wp-privacy-policy-content.php';
|
||||
}
|
||||
|
||||
$privacy_policy_content = WP_Privacy_Policy_Content::get_default_content();
|
||||
@@ -440,8 +440,10 @@ Commenter avatars come from <a href="%s">Gravatar</a>.'
|
||||
$wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix . 'user_level' ) );
|
||||
$wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix . 'capabilities' ) );
|
||||
|
||||
// Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.)
|
||||
// TODO: Get previous_blog_id.
|
||||
/*
|
||||
* Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.)
|
||||
* TODO: Get previous_blog_id.
|
||||
*/
|
||||
if ( ! is_super_admin( $user_id ) && 1 != $user_id ) {
|
||||
$wpdb->delete(
|
||||
$wpdb->usermeta,
|
||||
@@ -654,6 +656,8 @@ if ( ! function_exists( 'wp_upgrade' ) ) :
|
||||
update_site_meta( get_current_blog_id(), 'db_last_updated', microtime() );
|
||||
}
|
||||
|
||||
delete_transient( 'wp_core_block_css_files' );
|
||||
|
||||
/**
|
||||
* Fires after a site is fully upgraded.
|
||||
*
|
||||
@@ -832,6 +836,10 @@ function upgrade_all() {
|
||||
upgrade_600();
|
||||
}
|
||||
|
||||
if ( $wp_current_db_version < 55853 ) {
|
||||
upgrade_630();
|
||||
}
|
||||
|
||||
maybe_disable_link_manager();
|
||||
|
||||
maybe_disable_automattic_widgets();
|
||||
@@ -1638,8 +1646,10 @@ function upgrade_290() {
|
||||
global $wp_current_db_version;
|
||||
|
||||
if ( $wp_current_db_version < 11958 ) {
|
||||
// Previously, setting depth to 1 would redundantly disable threading,
|
||||
// but now 2 is the minimum depth to avoid confusion.
|
||||
/*
|
||||
* Previously, setting depth to 1 would redundantly disable threading,
|
||||
* but now 2 is the minimum depth to avoid confusion.
|
||||
*/
|
||||
if ( get_option( 'thread_comments_depth' ) == '1' ) {
|
||||
update_option( 'thread_comments_depth', 2 );
|
||||
update_option( 'thread_comments', 0 );
|
||||
@@ -1739,6 +1749,7 @@ function upgrade_330() {
|
||||
$_sidebars_widgets[ $index ][ $i ] = $id;
|
||||
continue;
|
||||
}
|
||||
|
||||
$id = sanitize_title( $name );
|
||||
if ( isset( $wp_registered_widgets[ $id ] ) ) {
|
||||
$_sidebars_widgets[ $index ][ $i ] = $id;
|
||||
@@ -1748,13 +1759,15 @@ function upgrade_330() {
|
||||
$found = false;
|
||||
|
||||
foreach ( $wp_registered_widgets as $widget_id => $widget ) {
|
||||
if ( strtolower( $widget['name'] ) == strtolower( $name ) ) {
|
||||
if ( strtolower( $widget['name'] ) === strtolower( $name ) ) {
|
||||
$_sidebars_widgets[ $index ][ $i ] = $widget['id'];
|
||||
$found = true;
|
||||
|
||||
$found = true;
|
||||
break;
|
||||
} elseif ( sanitize_title( $widget['name'] ) == sanitize_title( $name ) ) {
|
||||
} elseif ( sanitize_title( $widget['name'] ) === sanitize_title( $name ) ) {
|
||||
$_sidebars_widgets[ $index ][ $i ] = $widget['id'];
|
||||
$found = true;
|
||||
|
||||
$found = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -1835,7 +1848,7 @@ function upgrade_350() {
|
||||
if ( $wp_current_db_version < 21811 && wp_should_upgrade_global_tables() ) {
|
||||
$meta_keys = array();
|
||||
foreach ( array_merge( get_post_types(), get_taxonomies() ) as $name ) {
|
||||
if ( false !== strpos( $name, '-' ) ) {
|
||||
if ( str_contains( $name, '-' ) ) {
|
||||
$meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
|
||||
}
|
||||
}
|
||||
@@ -2290,6 +2303,29 @@ function upgrade_600() {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Executes changes made in WordPress 6.3.0.
|
||||
*
|
||||
* @ignore
|
||||
* @since 6.3.0
|
||||
*
|
||||
* @global int $wp_current_db_version The old (current) database version.
|
||||
*/
|
||||
function upgrade_630() {
|
||||
global $wp_current_db_version;
|
||||
|
||||
if ( $wp_current_db_version < 55853 ) {
|
||||
if ( ! is_multisite() ) {
|
||||
// Replace non-autoload option can_compress_scripts with autoload option, see #55270
|
||||
$can_compress_scripts = get_option( 'can_compress_scripts', false );
|
||||
if ( false !== $can_compress_scripts ) {
|
||||
delete_option( 'can_compress_scripts' );
|
||||
add_option( 'can_compress_scripts', $can_compress_scripts, '', 'yes' );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Executes network-level upgrade routines.
|
||||
*
|
||||
@@ -2739,19 +2775,27 @@ function dbDelta( $queries = '', $execute = true ) { // phpcs:ignore WordPress.N
|
||||
$iqueries = array(); // Insertion queries.
|
||||
$for_update = array();
|
||||
|
||||
// Create a tablename index for an array ($cqueries) of queries.
|
||||
// Create a tablename index for an array ($cqueries) of recognized query types.
|
||||
foreach ( $queries as $qry ) {
|
||||
if ( preg_match( '|CREATE TABLE ([^ ]*)|', $qry, $matches ) ) {
|
||||
$cqueries[ trim( $matches[1], '`' ) ] = $qry;
|
||||
$for_update[ $matches[1] ] = 'Created table ' . $matches[1];
|
||||
} elseif ( preg_match( '|CREATE DATABASE ([^ ]*)|', $qry, $matches ) ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( preg_match( '|CREATE DATABASE ([^ ]*)|', $qry, $matches ) ) {
|
||||
array_unshift( $cqueries, $qry );
|
||||
} elseif ( preg_match( '|INSERT INTO ([^ ]*)|', $qry, $matches ) ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( preg_match( '|INSERT INTO ([^ ]*)|', $qry, $matches ) ) {
|
||||
$iqueries[] = $qry;
|
||||
} elseif ( preg_match( '|UPDATE ([^ ]*)|', $qry, $matches ) ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( preg_match( '|UPDATE ([^ ]*)|', $qry, $matches ) ) {
|
||||
$iqueries[] = $qry;
|
||||
} else {
|
||||
// Unrecognized query type.
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3070,16 +3114,20 @@ function dbDelta( $queries = '', $execute = true ) { // phpcs:ignore WordPress.N
|
||||
} elseif ( $index_data['unique'] ) {
|
||||
$index_string .= 'UNIQUE ';
|
||||
}
|
||||
|
||||
if ( 'FULLTEXT' === strtoupper( $index_data['index_type'] ) ) {
|
||||
$index_string .= 'FULLTEXT ';
|
||||
}
|
||||
|
||||
if ( 'SPATIAL' === strtoupper( $index_data['index_type'] ) ) {
|
||||
$index_string .= 'SPATIAL ';
|
||||
}
|
||||
|
||||
$index_string .= 'KEY ';
|
||||
if ( 'primary' !== $index_name ) {
|
||||
$index_string .= '`' . $index_name . '`';
|
||||
}
|
||||
|
||||
$index_columns = '';
|
||||
|
||||
// For each column in the index.
|
||||
@@ -3176,8 +3224,9 @@ function make_db_current_silent( $tables = 'all' ) {
|
||||
* @return bool
|
||||
*/
|
||||
function make_site_theme_from_oldschool( $theme_name, $template ) {
|
||||
$home_path = get_home_path();
|
||||
$site_dir = WP_CONTENT_DIR . "/themes/$template";
|
||||
$home_path = get_home_path();
|
||||
$site_dir = WP_CONTENT_DIR . "/themes/$template";
|
||||
$default_dir = WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME;
|
||||
|
||||
if ( ! file_exists( "$home_path/index.php" ) ) {
|
||||
return false;
|
||||
@@ -3204,8 +3253,8 @@ function make_site_theme_from_oldschool( $theme_name, $template ) {
|
||||
// Check to make sure it's not a new index.
|
||||
if ( 'index.php' === $oldfile ) {
|
||||
$index = implode( '', file( "$oldpath/$oldfile" ) );
|
||||
if ( strpos( $index, 'WP_USE_THEMES' ) !== false ) {
|
||||
if ( ! copy( WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile" ) ) {
|
||||
if ( str_contains( $index, 'WP_USE_THEMES' ) ) {
|
||||
if ( ! copy( "$default_dir/$oldfile", "$site_dir/$newfile" ) ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -3231,10 +3280,18 @@ function make_site_theme_from_oldschool( $theme_name, $template ) {
|
||||
}
|
||||
|
||||
// Update stylesheet references.
|
||||
$line = str_replace( "<?php echo __get_option('siteurl'); ?>/wp-layout.css", "<?php bloginfo('stylesheet_url'); ?>", $line );
|
||||
$line = str_replace(
|
||||
"<?php echo __get_option('siteurl'); ?>/wp-layout.css",
|
||||
"<?php bloginfo('stylesheet_url'); ?>",
|
||||
$line
|
||||
);
|
||||
|
||||
// Update comments template inclusion.
|
||||
$line = str_replace( "<?php include(ABSPATH . 'wp-comments.php'); ?>", '<?php comments_template(); ?>', $line );
|
||||
$line = str_replace(
|
||||
"<?php include(ABSPATH . 'wp-comments.php'); ?>",
|
||||
'<?php comments_template(); ?>',
|
||||
$line
|
||||
);
|
||||
|
||||
fwrite( $f, "{$line}\n" );
|
||||
}
|
||||
@@ -3243,7 +3300,13 @@ function make_site_theme_from_oldschool( $theme_name, $template ) {
|
||||
}
|
||||
|
||||
// Add a theme header.
|
||||
$header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option( 'siteurl' ) . "\nDescription: A theme automatically created by the update.\nVersion: 1.0\nAuthor: Moi\n*/\n";
|
||||
$header = "/*\n" .
|
||||
"Theme Name: $theme_name\n" .
|
||||
'Theme URI: ' . __get_option( 'siteurl' ) . "\n" .
|
||||
"Description: A theme automatically created by the update.\n" .
|
||||
"Version: 1.0\n" .
|
||||
"Author: Moi\n" .
|
||||
"*/\n";
|
||||
|
||||
$stylelines = file_get_contents( "$site_dir/style.css" );
|
||||
if ( $stylelines ) {
|
||||
@@ -3272,8 +3335,10 @@ function make_site_theme_from_default( $theme_name, $template ) {
|
||||
$site_dir = WP_CONTENT_DIR . "/themes/$template";
|
||||
$default_dir = WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME;
|
||||
|
||||
// Copy files from the default theme to the site theme.
|
||||
// $files = array( 'index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css' );
|
||||
/*
|
||||
* Copy files from the default theme to the site theme.
|
||||
* $files = array( 'index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css' );
|
||||
*/
|
||||
|
||||
$theme_dir = @opendir( $default_dir );
|
||||
if ( $theme_dir ) {
|
||||
@@ -3281,9 +3346,11 @@ function make_site_theme_from_default( $theme_name, $template ) {
|
||||
if ( is_dir( "$default_dir/$theme_file" ) ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( ! copy( "$default_dir/$theme_file", "$site_dir/$theme_file" ) ) {
|
||||
return;
|
||||
}
|
||||
|
||||
chmod( "$site_dir/$theme_file", 0777 );
|
||||
}
|
||||
|
||||
@@ -3295,20 +3362,25 @@ function make_site_theme_from_default( $theme_name, $template ) {
|
||||
if ( $stylelines ) {
|
||||
$f = fopen( "$site_dir/style.css", 'w' );
|
||||
|
||||
$headers = array(
|
||||
'Theme Name:' => $theme_name,
|
||||
'Theme URI:' => __get_option( 'url' ),
|
||||
'Description:' => 'Your theme.',
|
||||
'Version:' => '1',
|
||||
'Author:' => 'You',
|
||||
);
|
||||
|
||||
foreach ( $stylelines as $line ) {
|
||||
if ( strpos( $line, 'Theme Name:' ) !== false ) {
|
||||
$line = 'Theme Name: ' . $theme_name;
|
||||
} elseif ( strpos( $line, 'Theme URI:' ) !== false ) {
|
||||
$line = 'Theme URI: ' . __get_option( 'url' );
|
||||
} elseif ( strpos( $line, 'Description:' ) !== false ) {
|
||||
$line = 'Description: Your theme.';
|
||||
} elseif ( strpos( $line, 'Version:' ) !== false ) {
|
||||
$line = 'Version: 1';
|
||||
} elseif ( strpos( $line, 'Author:' ) !== false ) {
|
||||
$line = 'Author: You';
|
||||
foreach ( $headers as $header => $value ) {
|
||||
if ( str_contains( $line, $header ) ) {
|
||||
$line = $header . ' ' . $value;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
fwrite( $f, $line . "\n" );
|
||||
}
|
||||
|
||||
fclose( $f );
|
||||
}
|
||||
|
||||
@@ -3324,9 +3396,11 @@ function make_site_theme_from_default( $theme_name, $template ) {
|
||||
if ( is_dir( "$default_dir/images/$image" ) ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( ! copy( "$default_dir/images/$image", "$site_dir/images/$image" ) ) {
|
||||
return;
|
||||
}
|
||||
|
||||
chmod( "$site_dir/images/$image", 0777 );
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user