--- a/wp/wp-admin/includes/upgrade.php Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-admin/includes/upgrade.php Mon Oct 14 18:28:13 2019 +0200
@@ -9,325 +9,484 @@
*/
/** Include user installation customization script. */
-if ( file_exists(WP_CONTENT_DIR . '/install.php') )
- require (WP_CONTENT_DIR . '/install.php');
+if ( file_exists( WP_CONTENT_DIR . '/install.php' ) ) {
+ require( WP_CONTENT_DIR . '/install.php' );
+}
/** WordPress Administration API */
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once( ABSPATH . 'wp-admin/includes/admin.php' );
/** WordPress Schema API */
-require_once(ABSPATH . 'wp-admin/includes/schema.php');
-
-if ( !function_exists('wp_install') ) :
-/**
- * Installs the site.
- *
- * Runs the required functions to set up and populate the database,
- * including primary admin user and initial options.
- *
- * @since 2.1.0
- *
- * @param string $blog_title Site title.
- * @param string $user_name User's username.
- * @param string $user_email User's email.
- * @param bool $public Whether site is public.
- * @param string $deprecated Optional. Not used.
- * @param string $user_password Optional. User's chosen password. Default empty (random password).
- * @param string $language Optional. Language chosen. Default empty.
- * @return array Array keys 'url', 'user_id', 'password', and 'password_message'.
- */
-function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '' ) {
- if ( !empty( $deprecated ) )
- _deprecated_argument( __FUNCTION__, '2.6.0' );
-
- wp_check_mysql_version();
- wp_cache_flush();
- make_db_current_silent();
- populate_options();
- populate_roles();
-
- update_option('blogname', $blog_title);
- update_option('admin_email', $user_email);
- update_option('blog_public', $public);
-
- // Freshness of site - in the future, this could get more specific about actions taken, perhaps.
- update_option( 'fresh_site', 1 );
-
- if ( $language ) {
- update_option( 'WPLANG', $language );
- }
-
- $guessurl = wp_guess_url();
-
- update_option('siteurl', $guessurl);
-
- // If not a public blog, don't ping.
- if ( ! $public )
- update_option('default_pingback_flag', 0);
-
- /*
- * Create default user. If the user already exists, the user tables are
- * being shared among sites. Just set the role in that case.
+require_once( ABSPATH . 'wp-admin/includes/schema.php' );
+
+if ( ! function_exists( 'wp_install' ) ) :
+ /**
+ * Installs the site.
+ *
+ * Runs the required functions to set up and populate the database,
+ * including primary admin user and initial options.
+ *
+ * @since 2.1.0
+ *
+ * @param string $blog_title Site title.
+ * @param string $user_name User's username.
+ * @param string $user_email User's email.
+ * @param bool $public Whether site is public.
+ * @param string $deprecated Optional. Not used.
+ * @param string $user_password Optional. User's chosen password. Default empty (random password).
+ * @param string $language Optional. Language chosen. Default empty.
+ * @return array Array keys 'url', 'user_id', 'password', and 'password_message'.
*/
- $user_id = username_exists($user_name);
- $user_password = trim($user_password);
- $email_password = false;
- if ( !$user_id && empty($user_password) ) {
- $user_password = wp_generate_password( 12, false );
- $message = __('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.');
- $user_id = wp_create_user($user_name, $user_password, $user_email);
- update_user_option($user_id, 'default_password_nag', true, true);
- $email_password = true;
- } elseif ( ! $user_id ) {
- // Password has been provided
- $message = '<em>'.__('Your chosen password.').'</em>';
- $user_id = wp_create_user($user_name, $user_password, $user_email);
- } else {
- $message = __('User already exists. Password inherited.');
- }
-
- $user = new WP_User($user_id);
- $user->set_role('administrator');
-
- wp_install_defaults($user_id);
-
- wp_install_maybe_enable_pretty_permalinks();
-
- flush_rewrite_rules();
-
- wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during installation.') ) );
-
- wp_cache_flush();
-
- /**
- * Fires after a site is fully installed.
- *
- * @since 3.9.0
- *
- * @param WP_User $user The site owner.
- */
- do_action( 'wp_install', $user );
-
- return array('url' => $guessurl, 'user_id' => $user_id, 'password' => $user_password, 'password_message' => $message);
-}
-endif;
-
-if ( !function_exists('wp_install_defaults') ) :
-/**
- * Creates the initial content for a newly-installed site.
- *
- * Adds the default "Uncategorized" category, the first post (with comment),
- * first page, and default widgets for default theme for the current version.
- *
- * @since 2.1.0
- *
- * @global wpdb $wpdb
- * @global WP_Rewrite $wp_rewrite
- * @global string $table_prefix
- *
- * @param int $user_id User ID.
- */
-function wp_install_defaults( $user_id ) {
- global $wpdb, $wp_rewrite, $table_prefix;
-
- // Default category
- $cat_name = __('Uncategorized');
- /* translators: Default category slug */
- $cat_slug = sanitize_title(_x('Uncategorized', 'Default category slug'));
-
- if ( global_terms_enabled() ) {
- $cat_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
- if ( $cat_id == null ) {
- $wpdb->insert( $wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) );
- $cat_id = $wpdb->insert_id;
+ function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '' ) {
+ if ( ! empty( $deprecated ) ) {
+ _deprecated_argument( __FUNCTION__, '2.6.0' );
+ }
+
+ wp_check_mysql_version();
+ wp_cache_flush();
+ make_db_current_silent();
+ populate_options();
+ populate_roles();
+
+ update_option( 'blogname', $blog_title );
+ update_option( 'admin_email', $user_email );
+ update_option( 'blog_public', $public );
+
+ // Freshness of site - in the future, this could get more specific about actions taken, perhaps.
+ update_option( 'fresh_site', 1 );
+
+ if ( $language ) {
+ update_option( 'WPLANG', $language );
+ }
+
+ $guessurl = wp_guess_url();
+
+ update_option( 'siteurl', $guessurl );
+
+ // If not a public site, don't ping.
+ if ( ! $public ) {
+ update_option( 'default_pingback_flag', 0 );
+ }
+
+ /*
+ * Create default user. If the user already exists, the user tables are
+ * being shared among sites. Just set the role in that case.
+ */
+ $user_id = username_exists( $user_name );
+ $user_password = trim( $user_password );
+ $email_password = false;
+ if ( ! $user_id && empty( $user_password ) ) {
+ $user_password = wp_generate_password( 12, false );
+ $message = __( '<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.' );
+ $user_id = wp_create_user( $user_name, $user_password, $user_email );
+ update_user_option( $user_id, 'default_password_nag', true, true );
+ $email_password = true;
+ } elseif ( ! $user_id ) {
+ // Password has been provided
+ $message = '<em>' . __( 'Your chosen password.' ) . '</em>';
+ $user_id = wp_create_user( $user_name, $user_password, $user_email );
+ } else {
+ $message = __( 'User already exists. Password inherited.' );
}
- update_option('default_category', $cat_id);
- } else {
- $cat_id = 1;
- }
-
- $wpdb->insert( $wpdb->terms, array('term_id' => $cat_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
- $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $cat_id, 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
- $cat_tt_id = $wpdb->insert_id;
-
- // First post
- $now = current_time( 'mysql' );
- $now_gmt = current_time( 'mysql', 1 );
- $first_post_guid = get_option( 'home' ) . '/?p=1';
-
- if ( is_multisite() ) {
- $first_post = get_site_option( 'first_post' );
-
- if ( ! $first_post ) {
- /* translators: %s: site link */
- $first_post = __( 'Welcome to %s. This is your first post. Edit or delete it, then start blogging!' );
- }
-
- $first_post = sprintf( $first_post,
- sprintf( '<a href="%s">%s</a>', esc_url( network_home_url() ), get_network()->site_name )
+
+ $user = new WP_User( $user_id );
+ $user->set_role( 'administrator' );
+
+ wp_install_defaults( $user_id );
+
+ wp_install_maybe_enable_pretty_permalinks();
+
+ flush_rewrite_rules();
+
+ wp_new_blog_notification( $blog_title, $guessurl, $user_id, ( $email_password ? $user_password : __( 'The password you chose during installation.' ) ) );
+
+ wp_cache_flush();
+
+ /**
+ * Fires after a site is fully installed.
+ *
+ * @since 3.9.0
+ *
+ * @param WP_User $user The site owner.
+ */
+ do_action( 'wp_install', $user );
+
+ return array(
+ 'url' => $guessurl,
+ 'user_id' => $user_id,
+ 'password' => $user_password,
+ 'password_message' => $message,
);
-
- // Back-compat for pre-4.4
- $first_post = str_replace( 'SITE_URL', esc_url( network_home_url() ), $first_post );
- $first_post = str_replace( 'SITE_NAME', get_network()->site_name, $first_post );
- } else {
- $first_post = __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!' );
- }
-
- $wpdb->insert( $wpdb->posts, array(
- 'post_author' => $user_id,
- 'post_date' => $now,
- 'post_date_gmt' => $now_gmt,
- 'post_content' => $first_post,
- 'post_excerpt' => '',
- 'post_title' => __('Hello world!'),
- /* translators: Default post slug */
- 'post_name' => sanitize_title( _x('hello-world', 'Default post slug') ),
- 'post_modified' => $now,
- 'post_modified_gmt' => $now_gmt,
- 'guid' => $first_post_guid,
- 'comment_count' => 1,
- 'to_ping' => '',
- 'pinged' => '',
- 'post_content_filtered' => ''
- ));
- $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1) );
-
- // Default comment
- if ( is_multisite() ) {
- $first_comment_author = get_site_option( 'first_comment_author' );
- $first_comment_email = get_site_option( 'first_comment_email' );
- $first_comment_url = get_site_option( 'first_comment_url', network_home_url() );
- $first_comment = get_site_option( 'first_comment' );
}
-
- $first_comment_author = ! empty( $first_comment_author ) ? $first_comment_author : __( 'A WordPress Commenter' );
- $first_comment_email = ! empty( $first_comment_email ) ? $first_comment_email : 'wapuu@wordpress.example';
- $first_comment_url = ! empty( $first_comment_url ) ? $first_comment_url : 'https://wordpress.org/';
- $first_comment = ! empty( $first_comment ) ? $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 <a href="https://gravatar.com">Gravatar</a>.' );
- $wpdb->insert( $wpdb->comments, array(
- 'comment_post_ID' => 1,
- 'comment_author' => $first_comment_author,
- 'comment_author_email' => $first_comment_email,
- 'comment_author_url' => $first_comment_url,
- 'comment_date' => $now,
- 'comment_date_gmt' => $now_gmt,
- 'comment_content' => $first_comment
- ));
-
- // First Page
- if ( is_multisite() )
- $first_page = get_site_option( 'first_page' );
-
- $first_page = ! empty( $first_page ) ? $first_page : sprintf( __( "This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:
-
-<blockquote>Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like piña coladas. (And gettin' caught in the rain.)</blockquote>
-
-...or something like this:
-
-<blockquote>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</blockquote>
-
-As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!" ), admin_url() );
-
- $first_post_guid = get_option('home') . '/?page_id=2';
- $wpdb->insert( $wpdb->posts, array(
- 'post_author' => $user_id,
- 'post_date' => $now,
- 'post_date_gmt' => $now_gmt,
- 'post_content' => $first_page,
- 'post_excerpt' => '',
- 'comment_status' => 'closed',
- 'post_title' => __( 'Sample Page' ),
- /* translators: Default page slug */
- 'post_name' => __( 'sample-page' ),
- 'post_modified' => $now,
- 'post_modified_gmt' => $now_gmt,
- 'guid' => $first_post_guid,
- 'post_type' => 'page',
- 'to_ping' => '',
- 'pinged' => '',
- 'post_content_filtered' => ''
- ));
- $wpdb->insert( $wpdb->postmeta, array( 'post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default' ) );
-
- // Privacy Policy page
- if ( is_multisite() ) {
- // Disable by default unless the suggested content is provided.
- $privacy_policy_content = get_site_option( 'default_privacy_policy_content' );
- } else {
- if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {
- include_once( ABSPATH . 'wp-admin/includes/misc.php' );
+endif;
+
+if ( ! function_exists( 'wp_install_defaults' ) ) :
+ /**
+ * Creates the initial content for a newly-installed site.
+ *
+ * Adds the default "Uncategorized" category, the first post (with comment),
+ * first page, and default widgets for default theme for the current version.
+ *
+ * @since 2.1.0
+ *
+ * @global wpdb $wpdb
+ * @global WP_Rewrite $wp_rewrite
+ * @global string $table_prefix
+ *
+ * @param int $user_id User ID.
+ */
+ function wp_install_defaults( $user_id ) {
+ global $wpdb, $wp_rewrite, $table_prefix;
+
+ // Default category
+ $cat_name = __( 'Uncategorized' );
+ /* translators: Default category slug */
+ $cat_slug = sanitize_title( _x( 'Uncategorized', 'Default category slug' ) );
+
+ if ( global_terms_enabled() ) {
+ $cat_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
+ if ( $cat_id == null ) {
+ $wpdb->insert(
+ $wpdb->sitecategories,
+ array(
+ 'cat_ID' => 0,
+ 'cat_name' => $cat_name,
+ 'category_nicename' => $cat_slug,
+ 'last_updated' => current_time( 'mysql', true ),
+ )
+ );
+ $cat_id = $wpdb->insert_id;
+ }
+ update_option( 'default_category', $cat_id );
+ } else {
+ $cat_id = 1;
}
- $privacy_policy_content = WP_Privacy_Policy_Content::get_default_content();
- }
-
- if ( ! empty( $privacy_policy_content ) ) {
- $privacy_policy_guid = get_option( 'home' ) . '/?page_id=3';
-
$wpdb->insert(
- $wpdb->posts, array(
+ $wpdb->terms,
+ array(
+ 'term_id' => $cat_id,
+ 'name' => $cat_name,
+ 'slug' => $cat_slug,
+ 'term_group' => 0,
+ )
+ );
+ $wpdb->insert(
+ $wpdb->term_taxonomy,
+ array(
+ 'term_id' => $cat_id,
+ 'taxonomy' => 'category',
+ 'description' => '',
+ 'parent' => 0,
+ 'count' => 1,
+ )
+ );
+ $cat_tt_id = $wpdb->insert_id;
+
+ // First post
+ $now = current_time( 'mysql' );
+ $now_gmt = current_time( 'mysql', 1 );
+ $first_post_guid = get_option( 'home' ) . '/?p=1';
+
+ if ( is_multisite() ) {
+ $first_post = get_site_option( 'first_post' );
+
+ if ( ! $first_post ) {
+ $first_post = "<!-- wp:paragraph -->\n<p>" .
+ /* translators: first post content, %s: site link */
+ __( 'Welcome to %s. This is your first post. Edit or delete it, then start writing!' ) .
+ "</p>\n<!-- /wp:paragraph -->";
+ }
+
+ $first_post = sprintf(
+ $first_post,
+ sprintf( '<a href="%s">%s</a>', esc_url( network_home_url() ), get_network()->site_name )
+ );
+
+ // Back-compat for pre-4.4
+ $first_post = str_replace( 'SITE_URL', esc_url( network_home_url() ), $first_post );
+ $first_post = str_replace( 'SITE_NAME', get_network()->site_name, $first_post );
+ } else {
+ $first_post = "<!-- wp:paragraph -->\n<p>" .
+ /* translators: first post content, %s: site link */
+ __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!' ) .
+ "</p>\n<!-- /wp:paragraph -->";
+ }
+
+ $wpdb->insert(
+ $wpdb->posts,
+ array(
'post_author' => $user_id,
'post_date' => $now,
'post_date_gmt' => $now_gmt,
- 'post_content' => $privacy_policy_content,
+ 'post_content' => $first_post,
'post_excerpt' => '',
- 'comment_status' => 'closed',
- 'post_title' => __( 'Privacy Policy' ),
- /* translators: Privacy Policy page slug */
- 'post_name' => __( 'privacy-policy' ),
+ 'post_title' => __( 'Hello world!' ),
+ /* translators: Default post slug */
+ 'post_name' => sanitize_title( _x( 'hello-world', 'Default post slug' ) ),
'post_modified' => $now,
'post_modified_gmt' => $now_gmt,
- 'guid' => $privacy_policy_guid,
- 'post_type' => 'page',
- 'post_status' => 'draft',
+ 'guid' => $first_post_guid,
+ 'comment_count' => 1,
'to_ping' => '',
'pinged' => '',
'post_content_filtered' => '',
)
);
$wpdb->insert(
- $wpdb->postmeta, array(
- 'post_id' => 3,
+ $wpdb->term_relationships,
+ array(
+ 'term_taxonomy_id' => $cat_tt_id,
+ 'object_id' => 1,
+ )
+ );
+
+ // Default comment
+ if ( is_multisite() ) {
+ $first_comment_author = get_site_option( 'first_comment_author' );
+ $first_comment_email = get_site_option( 'first_comment_email' );
+ $first_comment_url = get_site_option( 'first_comment_url', network_home_url() );
+ $first_comment = get_site_option( 'first_comment' );
+ }
+
+ $first_comment_author = ! empty( $first_comment_author ) ? $first_comment_author : __( 'A WordPress Commenter' );
+ $first_comment_email = ! empty( $first_comment_email ) ? $first_comment_email : 'wapuu@wordpress.example';
+ $first_comment_url = ! empty( $first_comment_url ) ? $first_comment_url : 'https://wordpress.org/';
+ $first_comment = ! empty( $first_comment ) ? $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 <a href="https://gravatar.com">Gravatar</a>.'
+ );
+ $wpdb->insert(
+ $wpdb->comments,
+ array(
+ 'comment_post_ID' => 1,
+ 'comment_author' => $first_comment_author,
+ 'comment_author_email' => $first_comment_email,
+ 'comment_author_url' => $first_comment_url,
+ 'comment_date' => $now,
+ 'comment_date_gmt' => $now_gmt,
+ 'comment_content' => $first_comment,
+ )
+ );
+
+ // First Page
+ if ( is_multisite() ) {
+ $first_page = get_site_option( 'first_page' );
+ }
+
+ if ( empty( $first_page ) ) {
+ $first_page = "<!-- wp:paragraph -->\n<p>";
+ /* translators: first page content */
+ $first_page .= __( "This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:" );
+ $first_page .= "</p>\n<!-- /wp:paragraph -->\n\n";
+
+ $first_page .= "<!-- wp:quote -->\n<blockquote class=\"wp-block-quote\"><p>";
+ /* translators: first page content */
+ $first_page .= __( "Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like piña coladas. (And gettin' caught in the rain.)" );
+ $first_page .= "</p></blockquote>\n<!-- /wp:quote -->\n\n";
+
+ $first_page .= "<!-- wp:paragraph -->\n<p>";
+ /* translators: first page content */
+ $first_page .= __( '...or something like this:' );
+ $first_page .= "</p>\n<!-- /wp:paragraph -->\n\n";
+
+ $first_page .= "<!-- wp:quote -->\n<blockquote class=\"wp-block-quote\"><p>";
+ /* translators: first page content */
+ $first_page .= __( 'The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.' );
+ $first_page .= "</p></blockquote>\n<!-- /wp:quote -->\n\n";
+
+ $first_page .= "<!-- wp:paragraph -->\n<p>";
+ $first_page .= sprintf(
+ /* translators: first page content, %s: site admin URL */
+ __( 'As a new WordPress user, you should go to <a href="%s">your dashboard</a> to delete this page and create new pages for your content. Have fun!' ),
+ admin_url()
+ );
+ $first_page .= "</p>\n<!-- /wp:paragraph -->";
+ }
+
+ $first_post_guid = get_option( 'home' ) . '/?page_id=2';
+ $wpdb->insert(
+ $wpdb->posts,
+ array(
+ 'post_author' => $user_id,
+ 'post_date' => $now,
+ 'post_date_gmt' => $now_gmt,
+ 'post_content' => $first_page,
+ 'post_excerpt' => '',
+ 'comment_status' => 'closed',
+ 'post_title' => __( 'Sample Page' ),
+ /* translators: Default page slug */
+ 'post_name' => __( 'sample-page' ),
+ 'post_modified' => $now,
+ 'post_modified_gmt' => $now_gmt,
+ 'guid' => $first_post_guid,
+ 'post_type' => 'page',
+ 'to_ping' => '',
+ 'pinged' => '',
+ 'post_content_filtered' => '',
+ )
+ );
+ $wpdb->insert(
+ $wpdb->postmeta,
+ array(
+ 'post_id' => 2,
'meta_key' => '_wp_page_template',
'meta_value' => 'default',
)
);
- update_option( 'wp_page_for_privacy_policy', 3 );
+
+ // Privacy Policy page
+ if ( is_multisite() ) {
+ // Disable by default unless the suggested content is provided.
+ $privacy_policy_content = get_site_option( 'default_privacy_policy_content' );
+ } else {
+ if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {
+ include_once( ABSPATH . 'wp-admin/includes/misc.php' );
+ }
+
+ $privacy_policy_content = WP_Privacy_Policy_Content::get_default_content();
+ }
+
+ if ( ! empty( $privacy_policy_content ) ) {
+ $privacy_policy_guid = get_option( 'home' ) . '/?page_id=3';
+
+ $wpdb->insert(
+ $wpdb->posts,
+ array(
+ 'post_author' => $user_id,
+ 'post_date' => $now,
+ 'post_date_gmt' => $now_gmt,
+ 'post_content' => $privacy_policy_content,
+ 'post_excerpt' => '',
+ 'comment_status' => 'closed',
+ 'post_title' => __( 'Privacy Policy' ),
+ /* translators: Privacy Policy page slug */
+ 'post_name' => __( 'privacy-policy' ),
+ 'post_modified' => $now,
+ 'post_modified_gmt' => $now_gmt,
+ 'guid' => $privacy_policy_guid,
+ 'post_type' => 'page',
+ 'post_status' => 'draft',
+ 'to_ping' => '',
+ 'pinged' => '',
+ 'post_content_filtered' => '',
+ )
+ );
+ $wpdb->insert(
+ $wpdb->postmeta,
+ array(
+ 'post_id' => 3,
+ 'meta_key' => '_wp_page_template',
+ 'meta_value' => 'default',
+ )
+ );
+ update_option( 'wp_page_for_privacy_policy', 3 );
+ }
+
+ // Set up default widgets for default theme.
+ update_option(
+ 'widget_search',
+ array(
+ 2 => array( 'title' => '' ),
+ '_multiwidget' => 1,
+ )
+ );
+ update_option(
+ 'widget_recent-posts',
+ array(
+ 2 => array(
+ 'title' => '',
+ 'number' => 5,
+ ),
+ '_multiwidget' => 1,
+ )
+ );
+ update_option(
+ 'widget_recent-comments',
+ array(
+ 2 => array(
+ 'title' => '',
+ 'number' => 5,
+ ),
+ '_multiwidget' => 1,
+ )
+ );
+ update_option(
+ 'widget_archives',
+ array(
+ 2 => array(
+ 'title' => '',
+ 'count' => 0,
+ 'dropdown' => 0,
+ ),
+ '_multiwidget' => 1,
+ )
+ );
+ update_option(
+ 'widget_categories',
+ array(
+ 2 => array(
+ 'title' => '',
+ 'count' => 0,
+ 'hierarchical' => 0,
+ 'dropdown' => 0,
+ ),
+ '_multiwidget' => 1,
+ )
+ );
+ update_option(
+ 'widget_meta',
+ array(
+ 2 => array( 'title' => '' ),
+ '_multiwidget' => 1,
+ )
+ );
+ update_option(
+ 'sidebars_widgets',
+ array(
+ 'wp_inactive_widgets' => array(),
+ 'sidebar-1' => array(
+ 0 => 'search-2',
+ 1 => 'recent-posts-2',
+ 2 => 'recent-comments-2',
+ 3 => 'archives-2',
+ 4 => 'categories-2',
+ 5 => 'meta-2',
+ ),
+ 'array_version' => 3,
+ )
+ );
+ if ( ! is_multisite() ) {
+ update_user_meta( $user_id, 'show_welcome_panel', 1 );
+ } elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) ) {
+ update_user_meta( $user_id, 'show_welcome_panel', 2 );
+ }
+
+ if ( is_multisite() ) {
+ // Flush rules to pick up the new page.
+ $wp_rewrite->init();
+ $wp_rewrite->flush_rules();
+
+ $user = new WP_User( $user_id );
+ $wpdb->update( $wpdb->options, array( 'option_value' => $user->user_email ), array( 'option_name' => 'admin_email' ) );
+
+ // Remove all perms except for the login user.
+ $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.
+ if ( ! is_super_admin( $user_id ) && $user_id != 1 ) {
+ $wpdb->delete(
+ $wpdb->usermeta,
+ array(
+ 'user_id' => $user_id,
+ 'meta_key' => $wpdb->base_prefix . '1_capabilities',
+ )
+ );
+ }
+ }
}
-
- // Set up default widgets for default theme.
- update_option( 'widget_search', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
- update_option( 'widget_recent-posts', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
- update_option( 'widget_recent-comments', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
- update_option( 'widget_archives', array ( 2 => array ( 'title' => '', 'count' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
- update_option( 'widget_categories', array ( 2 => array ( 'title' => '', 'count' => 0, 'hierarchical' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
- update_option( 'widget_meta', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
- update_option( 'sidebars_widgets', array( 'wp_inactive_widgets' => array(), 'sidebar-1' => array( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2' ), 'sidebar-2' => array(), 'sidebar-3' => array(), 'array_version' => 3 ) );
- if ( ! is_multisite() )
- update_user_meta( $user_id, 'show_welcome_panel', 1 );
- elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) )
- update_user_meta( $user_id, 'show_welcome_panel', 2 );
-
- if ( is_multisite() ) {
- // Flush rules to pick up the new page.
- $wp_rewrite->init();
- $wp_rewrite->flush_rules();
-
- $user = new WP_User($user_id);
- $wpdb->update( $wpdb->options, array('option_value' => $user->user_email), array('option_name' => 'admin_email') );
-
- // Remove all perms except for the login user.
- $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.
- if ( !is_super_admin( $user_id ) && $user_id != 1 )
- $wpdb->delete( $wpdb->usermeta, array( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
- }
-}
endif;
/**
@@ -359,16 +518,16 @@
*/
$permalink_structures = array(
'/%year%/%monthnum%/%day%/%postname%/',
- '/index.php/%year%/%monthnum%/%day%/%postname%/'
+ '/index.php/%year%/%monthnum%/%day%/%postname%/',
);
foreach ( (array) $permalink_structures as $permalink_structure ) {
$wp_rewrite->set_permalink_structure( $permalink_structure );
/*
- * Flush rules with the hard option to force refresh of the web-server's
- * rewrite config file (e.g. .htaccess or web.config).
- */
+ * Flush rules with the hard option to force refresh of the web-server's
+ * rewrite config file (e.g. .htaccess or web.config).
+ */
$wp_rewrite->flush_rules( true );
$test_url = '';
@@ -380,12 +539,12 @@
}
/*
- * Send a request to the site, and check whether
- * the 'x-pingback' header is returned as expected.
- *
- * Uses wp_remote_get() instead of wp_remote_head() because web servers
- * can block head requests.
- */
+ * Send a request to the site, and check whether
+ * the 'x-pingback' header is returned as expected.
+ *
+ * Uses wp_remote_get() instead of wp_remote_head() because web servers
+ * can block head requests.
+ */
$response = wp_remote_get( $test_url, array( 'timeout' => 5 ) );
$x_pingback_header = wp_remote_retrieve_header( $response, 'x-pingback' );
$pretty_permalinks = $x_pingback_header && $x_pingback_header === get_bloginfo( 'pingback_url' );
@@ -405,99 +564,110 @@
return false;
}
-if ( !function_exists('wp_new_blog_notification') ) :
-/**
- * Notifies the site admin that the setup is complete.
- *
- * Sends an email with wp_mail to the new administrator that the site setup is complete,
- * and provides them with a record of their login credentials.
- *
- * @since 2.1.0
- *
- * @param string $blog_title Site title.
- * @param string $blog_url Site url.
- * @param int $user_id User ID.
- * @param string $password User's Password.
- */
-function wp_new_blog_notification($blog_title, $blog_url, $user_id, $password) {
- $user = new WP_User( $user_id );
- $email = $user->user_email;
- $name = $user->user_login;
- $login_url = wp_login_url();
- /* translators: New site notification email. 1: New site URL, 2: User login, 3: User password or password reset link, 4: Login URL */
- $message = sprintf( __( "Your new WordPress site has been successfully set up at:
-
-%1\$s
+if ( ! function_exists( 'wp_new_blog_notification' ) ) :
+ /**
+ * Notifies the site admin that the setup is complete.
+ *
+ * Sends an email with wp_mail to the new administrator that the site setup is complete,
+ * and provides them with a record of their login credentials.
+ *
+ * @since 2.1.0
+ *
+ * @param string $blog_title Site title.
+ * @param string $blog_url Site url.
+ * @param int $user_id User ID.
+ * @param string $password User's Password.
+ */
+ function wp_new_blog_notification( $blog_title, $blog_url, $user_id, $password ) {
+ $user = new WP_User( $user_id );
+ $email = $user->user_email;
+ $name = $user->user_login;
+ $login_url = wp_login_url();
+ /* translators: New site notification email. 1: New site URL, 2: User login, 3: User password or password reset link, 4: Login URL */
+ $message = sprintf(
+ __(
+ 'Your new WordPress site has been successfully set up at:
+
+%1$s
You can log in to the administrator account with the following information:
-Username: %2\$s
-Password: %3\$s
-Log in here: %4\$s
+Username: %2$s
+Password: %3$s
+Log in here: %4$s
We hope you enjoy your new site. Thanks!
--The WordPress Team
https://wordpress.org/
-"), $blog_url, $name, $password, $login_url );
-
- @wp_mail($email, __('New WordPress Site'), $message);
-}
+'
+ ),
+ $blog_url,
+ $name,
+ $password,
+ $login_url
+ );
+
+ @wp_mail( $email, __( 'New WordPress Site' ), $message );
+ }
endif;
-if ( !function_exists('wp_upgrade') ) :
-/**
- * Runs WordPress Upgrade functions.
- *
- * Upgrades the database if needed during a site update.
- *
- * @since 2.1.0
- *
- * @global int $wp_current_db_version
- * @global int $wp_db_version
- * @global wpdb $wpdb WordPress database abstraction object.
- */
-function wp_upgrade() {
- global $wp_current_db_version, $wp_db_version, $wpdb;
-
- $wp_current_db_version = __get_option('db_version');
-
- // We are up-to-date. Nothing to do.
- if ( $wp_db_version == $wp_current_db_version )
- return;
-
- if ( ! is_blog_installed() )
- return;
-
- wp_check_mysql_version();
- wp_cache_flush();
- pre_schema_upgrade();
- make_db_current_silent();
- upgrade_all();
- if ( is_multisite() && is_main_site() )
- upgrade_network();
- wp_cache_flush();
-
- if ( is_multisite() ) {
- $site_id = get_current_blog_id();
-
- if ( $wpdb->get_row( $wpdb->prepare( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = %d", $site_id ) ) ) {
- $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->blog_versions} SET db_version = %d WHERE blog_id = %d", $wp_db_version, $site_id ) );
- } else {
- $wpdb->query( $wpdb->prepare( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( %d, %d, NOW() );", $site_id, $wp_db_version ) );
+if ( ! function_exists( 'wp_upgrade' ) ) :
+ /**
+ * Runs WordPress Upgrade functions.
+ *
+ * Upgrades the database if needed during a site update.
+ *
+ * @since 2.1.0
+ *
+ * @global int $wp_current_db_version
+ * @global int $wp_db_version
+ * @global wpdb $wpdb WordPress database abstraction object.
+ */
+ function wp_upgrade() {
+ global $wp_current_db_version, $wp_db_version, $wpdb;
+
+ $wp_current_db_version = __get_option( 'db_version' );
+
+ // We are up-to-date. Nothing to do.
+ if ( $wp_db_version == $wp_current_db_version ) {
+ return;
+ }
+
+ if ( ! is_blog_installed() ) {
+ return;
}
+
+ wp_check_mysql_version();
+ wp_cache_flush();
+ pre_schema_upgrade();
+ make_db_current_silent();
+ upgrade_all();
+ if ( is_multisite() && is_main_site() ) {
+ upgrade_network();
+ }
+ wp_cache_flush();
+
+ if ( is_multisite() ) {
+ $site_id = get_current_blog_id();
+
+ if ( $wpdb->get_row( $wpdb->prepare( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = %d", $site_id ) ) ) {
+ $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->blog_versions} SET db_version = %d WHERE blog_id = %d", $wp_db_version, $site_id ) );
+ } else {
+ $wpdb->query( $wpdb->prepare( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( %d, %d, NOW() );", $site_id, $wp_db_version ) );
+ }
+ }
+
+ /**
+ * Fires after a site is fully upgraded.
+ *
+ * @since 3.9.0
+ *
+ * @param int $wp_db_version The new $wp_db_version.
+ * @param int $wp_current_db_version The old (current) $wp_db_version.
+ */
+ do_action( 'wp_upgrade', $wp_db_version, $wp_current_db_version );
}
-
- /**
- * Fires after a site is fully upgraded.
- *
- * @since 3.9.0
- *
- * @param int $wp_db_version The new $wp_db_version.
- * @param int $wp_current_db_version The old (current) $wp_db_version.
- */
- do_action( 'wp_upgrade', $wp_db_version, $wp_current_db_version );
-}
endif;
/**
@@ -514,24 +684,27 @@
*/
function upgrade_all() {
global $wp_current_db_version, $wp_db_version;
- $wp_current_db_version = __get_option('db_version');
+ $wp_current_db_version = __get_option( 'db_version' );
// We are up-to-date. Nothing to do.
- if ( $wp_db_version == $wp_current_db_version )
+ if ( $wp_db_version == $wp_current_db_version ) {
return;
+ }
// If the version is not set in the DB, try to guess the version.
- if ( empty($wp_current_db_version) ) {
+ if ( empty( $wp_current_db_version ) ) {
$wp_current_db_version = 0;
// If the template option exists, we have 1.5.
- $template = __get_option('template');
- if ( !empty($template) )
+ $template = __get_option( 'template' );
+ if ( ! empty( $template ) ) {
$wp_current_db_version = 2541;
+ }
}
- if ( $wp_current_db_version < 6039 )
+ if ( $wp_current_db_version < 6039 ) {
upgrade_230_options_table();
+ }
populate_options();
@@ -542,77 +715,105 @@
upgrade_130();
}
- if ( $wp_current_db_version < 3308 )
+ if ( $wp_current_db_version < 3308 ) {
upgrade_160();
-
- if ( $wp_current_db_version < 4772 )
+ }
+
+ if ( $wp_current_db_version < 4772 ) {
upgrade_210();
-
- if ( $wp_current_db_version < 4351 )
+ }
+
+ if ( $wp_current_db_version < 4351 ) {
upgrade_old_slugs();
-
- if ( $wp_current_db_version < 5539 )
+ }
+
+ if ( $wp_current_db_version < 5539 ) {
upgrade_230();
-
- if ( $wp_current_db_version < 6124 )
+ }
+
+ if ( $wp_current_db_version < 6124 ) {
upgrade_230_old_tables();
-
- if ( $wp_current_db_version < 7499 )
+ }
+
+ if ( $wp_current_db_version < 7499 ) {
upgrade_250();
-
- if ( $wp_current_db_version < 7935 )
+ }
+
+ if ( $wp_current_db_version < 7935 ) {
upgrade_252();
-
- if ( $wp_current_db_version < 8201 )
+ }
+
+ if ( $wp_current_db_version < 8201 ) {
upgrade_260();
-
- if ( $wp_current_db_version < 8989 )
+ }
+
+ if ( $wp_current_db_version < 8989 ) {
upgrade_270();
-
- if ( $wp_current_db_version < 10360 )
+ }
+
+ if ( $wp_current_db_version < 10360 ) {
upgrade_280();
-
- if ( $wp_current_db_version < 11958 )
+ }
+
+ if ( $wp_current_db_version < 11958 ) {
upgrade_290();
-
- if ( $wp_current_db_version < 15260 )
+ }
+
+ if ( $wp_current_db_version < 15260 ) {
upgrade_300();
-
- if ( $wp_current_db_version < 19389 )
+ }
+
+ if ( $wp_current_db_version < 19389 ) {
upgrade_330();
-
- if ( $wp_current_db_version < 20080 )
+ }
+
+ if ( $wp_current_db_version < 20080 ) {
upgrade_340();
-
- if ( $wp_current_db_version < 22422 )
+ }
+
+ if ( $wp_current_db_version < 22422 ) {
upgrade_350();
-
- if ( $wp_current_db_version < 25824 )
+ }
+
+ if ( $wp_current_db_version < 25824 ) {
upgrade_370();
-
- if ( $wp_current_db_version < 26148 )
+ }
+
+ if ( $wp_current_db_version < 26148 ) {
upgrade_372();
-
- if ( $wp_current_db_version < 26691 )
+ }
+
+ if ( $wp_current_db_version < 26691 ) {
upgrade_380();
-
- if ( $wp_current_db_version < 29630 )
+ }
+
+ if ( $wp_current_db_version < 29630 ) {
upgrade_400();
-
- if ( $wp_current_db_version < 33055 )
+ }
+
+ if ( $wp_current_db_version < 33055 ) {
upgrade_430();
-
- if ( $wp_current_db_version < 33056 )
+ }
+
+ if ( $wp_current_db_version < 33056 ) {
upgrade_431();
-
- if ( $wp_current_db_version < 35700 )
+ }
+
+ if ( $wp_current_db_version < 35700 ) {
upgrade_440();
-
- if ( $wp_current_db_version < 36686 )
+ }
+
+ if ( $wp_current_db_version < 36686 ) {
upgrade_450();
-
- if ( $wp_current_db_version < 37965 )
+ }
+
+ if ( $wp_current_db_version < 37965 ) {
upgrade_460();
+ }
+
+ if ( $wp_current_db_version < 44719 ) {
+ upgrade_510();
+ }
maybe_disable_link_manager();
@@ -634,21 +835,21 @@
global $wpdb;
// Get the title and ID of every post, post_name to check if it already has a value
- $posts = $wpdb->get_results("SELECT ID, post_title, post_name FROM $wpdb->posts WHERE post_name = ''");
- if ($posts) {
- foreach ($posts as $post) {
- if ('' == $post->post_name) {
- $newtitle = sanitize_title($post->post_title);
- $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_name = %s WHERE ID = %d", $newtitle, $post->ID) );
+ $posts = $wpdb->get_results( "SELECT ID, post_title, post_name FROM $wpdb->posts WHERE post_name = ''" );
+ if ( $posts ) {
+ foreach ( $posts as $post ) {
+ if ( '' == $post->post_name ) {
+ $newtitle = sanitize_title( $post->post_title );
+ $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_name = %s WHERE ID = %d", $newtitle, $post->ID ) );
}
}
}
- $categories = $wpdb->get_results("SELECT cat_ID, cat_name, category_nicename FROM $wpdb->categories");
- foreach ($categories as $category) {
- if ('' == $category->category_nicename) {
- $newtitle = sanitize_title($category->cat_name);
- $wpdb->update( $wpdb->categories, array('category_nicename' => $newtitle), array('cat_ID' => $category->cat_ID) );
+ $categories = $wpdb->get_results( "SELECT cat_ID, cat_name, category_nicename FROM $wpdb->categories" );
+ foreach ( $categories as $category ) {
+ if ( '' == $category->category_nicename ) {
+ $newtitle = sanitize_title( $category->cat_name );
+ $wpdb->update( $wpdb->categories, array( 'category_nicename' => $newtitle ), array( 'cat_ID' => $category->cat_ID ) );
}
}
@@ -658,24 +859,30 @@
AND option_value LIKE %s";
$wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( 'links_rating_image' ) . '%', $wpdb->esc_like( 'wp-links/links-images/' ) . '%' ) );
- $done_ids = $wpdb->get_results("SELECT DISTINCT post_id FROM $wpdb->post2cat");
- if ($done_ids) :
+ $done_ids = $wpdb->get_results( "SELECT DISTINCT post_id FROM $wpdb->post2cat" );
+ if ( $done_ids ) :
$done_posts = array();
- foreach ($done_ids as $done_id) :
+ foreach ( $done_ids as $done_id ) :
$done_posts[] = $done_id->post_id;
endforeach;
- $catwhere = ' AND ID NOT IN (' . implode(',', $done_posts) . ')';
- else:
+ $catwhere = ' AND ID NOT IN (' . implode( ',', $done_posts ) . ')';
+ else :
$catwhere = '';
endif;
- $allposts = $wpdb->get_results("SELECT ID, post_category FROM $wpdb->posts WHERE post_category != '0' $catwhere");
- if ($allposts) :
- foreach ($allposts as $post) {
+ $allposts = $wpdb->get_results( "SELECT ID, post_category FROM $wpdb->posts WHERE post_category != '0' $catwhere" );
+ if ( $allposts ) :
+ foreach ( $allposts as $post ) {
// Check to see if it's already been imported
- $cat = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->post2cat WHERE post_id = %d AND category_id = %d", $post->ID, $post->post_category) );
- if (!$cat && 0 != $post->post_category) { // If there's no result
- $wpdb->insert( $wpdb->post2cat, array('post_id' => $post->ID, 'category_id' => $post->post_category) );
+ $cat = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->post2cat WHERE post_id = %d AND category_id = %d", $post->ID, $post->post_category ) );
+ if ( ! $cat && 0 != $post->post_category ) { // If there's no result
+ $wpdb->insert(
+ $wpdb->post2cat,
+ array(
+ 'post_id' => $post->ID,
+ 'category_id' => $post->post_category,
+ )
+ );
}
}
endif;
@@ -693,13 +900,13 @@
global $wpdb;
// Clean up indices, add a few
- add_clean_index($wpdb->posts, 'post_name');
- add_clean_index($wpdb->posts, 'post_status');
- add_clean_index($wpdb->categories, 'category_nicename');
- add_clean_index($wpdb->comments, 'comment_approved');
- add_clean_index($wpdb->comments, 'comment_post_ID');
- add_clean_index($wpdb->links , 'link_category');
- add_clean_index($wpdb->links , 'link_visible');
+ add_clean_index( $wpdb->posts, 'post_name' );
+ add_clean_index( $wpdb->posts, 'post_status' );
+ add_clean_index( $wpdb->categories, 'category_nicename' );
+ add_clean_index( $wpdb->comments, 'comment_approved' );
+ add_clean_index( $wpdb->comments, 'comment_post_ID' );
+ add_clean_index( $wpdb->links, 'link_category' );
+ add_clean_index( $wpdb->links, 'link_visible' );
}
/**
@@ -714,18 +921,18 @@
global $wpdb;
// Set user_nicename.
- $users = $wpdb->get_results("SELECT ID, user_nickname, user_nicename FROM $wpdb->users");
- foreach ($users as $user) {
- if ('' == $user->user_nicename) {
- $newname = sanitize_title($user->user_nickname);
- $wpdb->update( $wpdb->users, array('user_nicename' => $newname), array('ID' => $user->ID) );
+ $users = $wpdb->get_results( "SELECT ID, user_nickname, user_nicename FROM $wpdb->users" );
+ foreach ( $users as $user ) {
+ if ( '' == $user->user_nicename ) {
+ $newname = sanitize_title( $user->user_nickname );
+ $wpdb->update( $wpdb->users, array( 'user_nicename' => $newname ), array( 'ID' => $user->ID ) );
}
}
- $users = $wpdb->get_results("SELECT ID, user_pass from $wpdb->users");
- foreach ($users as $row) {
- if (!preg_match('/^[A-Fa-f0-9]{32}$/', $row->user_pass)) {
- $wpdb->update( $wpdb->users, array('user_pass' => md5($row->user_pass)), array('ID' => $row->ID) );
+ $users = $wpdb->get_results( "SELECT ID, user_pass from $wpdb->users" );
+ foreach ( $users as $row ) {
+ if ( ! preg_match( '/^[A-Fa-f0-9]{32}$/', $row->user_pass ) ) {
+ $wpdb->update( $wpdb->users, array( 'user_pass' => md5( $row->user_pass ) ), array( 'ID' => $row->ID ) );
}
}
@@ -734,33 +941,33 @@
$time_difference = $all_options->time_difference;
- $server_time = time()+date('Z');
- $weblogger_time = $server_time + $time_difference * HOUR_IN_SECONDS;
- $gmt_time = time();
-
- $diff_gmt_server = ($gmt_time - $server_time) / HOUR_IN_SECONDS;
- $diff_weblogger_server = ($weblogger_time - $server_time) / HOUR_IN_SECONDS;
- $diff_gmt_weblogger = $diff_gmt_server - $diff_weblogger_server;
- $gmt_offset = -$diff_gmt_weblogger;
+ $server_time = time() + date( 'Z' );
+ $weblogger_time = $server_time + $time_difference * HOUR_IN_SECONDS;
+ $gmt_time = time();
+
+ $diff_gmt_server = ( $gmt_time - $server_time ) / HOUR_IN_SECONDS;
+ $diff_weblogger_server = ( $weblogger_time - $server_time ) / HOUR_IN_SECONDS;
+ $diff_gmt_weblogger = $diff_gmt_server - $diff_weblogger_server;
+ $gmt_offset = -$diff_gmt_weblogger;
// Add a gmt_offset option, with value $gmt_offset
- add_option('gmt_offset', $gmt_offset);
+ add_option( 'gmt_offset', $gmt_offset );
// Check if we already set the GMT fields (if we did, then
// MAX(post_date_gmt) can't be '0000-00-00 00:00:00'
// <michel_v> I just slapped myself silly for not thinking about it earlier
- $got_gmt_fields = ! ($wpdb->get_var("SELECT MAX(post_date_gmt) FROM $wpdb->posts") == '0000-00-00 00:00:00');
-
- if (!$got_gmt_fields) {
+ $got_gmt_fields = ! ( $wpdb->get_var( "SELECT MAX(post_date_gmt) FROM $wpdb->posts" ) == '0000-00-00 00:00:00' );
+
+ if ( ! $got_gmt_fields ) {
// Add or subtract time to all dates, to get GMT dates
- $add_hours = intval($diff_gmt_weblogger);
- $add_minutes = intval(60 * ($diff_gmt_weblogger - $add_hours));
- $wpdb->query("UPDATE $wpdb->posts SET post_date_gmt = DATE_ADD(post_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)");
- $wpdb->query("UPDATE $wpdb->posts SET post_modified = post_date");
- $wpdb->query("UPDATE $wpdb->posts SET post_modified_gmt = DATE_ADD(post_modified, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE) WHERE post_modified != '0000-00-00 00:00:00'");
- $wpdb->query("UPDATE $wpdb->comments SET comment_date_gmt = DATE_ADD(comment_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)");
- $wpdb->query("UPDATE $wpdb->users SET user_registered = DATE_ADD(user_registered, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)");
+ $add_hours = intval( $diff_gmt_weblogger );
+ $add_minutes = intval( 60 * ( $diff_gmt_weblogger - $add_hours ) );
+ $wpdb->query( "UPDATE $wpdb->posts SET post_date_gmt = DATE_ADD(post_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)" );
+ $wpdb->query( "UPDATE $wpdb->posts SET post_modified = post_date" );
+ $wpdb->query( "UPDATE $wpdb->posts SET post_modified_gmt = DATE_ADD(post_modified, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE) WHERE post_modified != '0000-00-00 00:00:00'" );
+ $wpdb->query( "UPDATE $wpdb->comments SET comment_date_gmt = DATE_ADD(comment_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)" );
+ $wpdb->query( "UPDATE $wpdb->users SET user_registered = DATE_ADD(user_registered, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)" );
}
}
@@ -777,74 +984,75 @@
global $wpdb;
// Remove extraneous backslashes.
- $posts = $wpdb->get_results("SELECT ID, post_title, post_content, post_excerpt, guid, post_date, post_name, post_status, post_author FROM $wpdb->posts");
- if ($posts) {
- foreach ($posts as $post) {
- $post_content = addslashes(deslash($post->post_content));
- $post_title = addslashes(deslash($post->post_title));
- $post_excerpt = addslashes(deslash($post->post_excerpt));
- if ( empty($post->guid) )
- $guid = get_permalink($post->ID);
- else
+ $posts = $wpdb->get_results( "SELECT ID, post_title, post_content, post_excerpt, guid, post_date, post_name, post_status, post_author FROM $wpdb->posts" );
+ if ( $posts ) {
+ foreach ( $posts as $post ) {
+ $post_content = addslashes( deslash( $post->post_content ) );
+ $post_title = addslashes( deslash( $post->post_title ) );
+ $post_excerpt = addslashes( deslash( $post->post_excerpt ) );
+ if ( empty( $post->guid ) ) {
+ $guid = get_permalink( $post->ID );
+ } else {
$guid = $post->guid;
-
- $wpdb->update( $wpdb->posts, compact('post_title', 'post_content', 'post_excerpt', 'guid'), array('ID' => $post->ID) );
+ }
+
+ $wpdb->update( $wpdb->posts, compact( 'post_title', 'post_content', 'post_excerpt', 'guid' ), array( 'ID' => $post->ID ) );
}
}
// Remove extraneous backslashes.
- $comments = $wpdb->get_results("SELECT comment_ID, comment_author, comment_content FROM $wpdb->comments");
- if ($comments) {
- foreach ($comments as $comment) {
- $comment_content = deslash($comment->comment_content);
- $comment_author = deslash($comment->comment_author);
-
- $wpdb->update($wpdb->comments, compact('comment_content', 'comment_author'), array('comment_ID' => $comment->comment_ID) );
+ $comments = $wpdb->get_results( "SELECT comment_ID, comment_author, comment_content FROM $wpdb->comments" );
+ if ( $comments ) {
+ foreach ( $comments as $comment ) {
+ $comment_content = deslash( $comment->comment_content );
+ $comment_author = deslash( $comment->comment_author );
+
+ $wpdb->update( $wpdb->comments, compact( 'comment_content', 'comment_author' ), array( 'comment_ID' => $comment->comment_ID ) );
}
}
// Remove extraneous backslashes.
- $links = $wpdb->get_results("SELECT link_id, link_name, link_description FROM $wpdb->links");
- if ($links) {
- foreach ($links as $link) {
- $link_name = deslash($link->link_name);
- $link_description = deslash($link->link_description);
-
- $wpdb->update( $wpdb->links, compact('link_name', 'link_description'), array('link_id' => $link->link_id) );
+ $links = $wpdb->get_results( "SELECT link_id, link_name, link_description FROM $wpdb->links" );
+ if ( $links ) {
+ foreach ( $links as $link ) {
+ $link_name = deslash( $link->link_name );
+ $link_description = deslash( $link->link_description );
+
+ $wpdb->update( $wpdb->links, compact( 'link_name', 'link_description' ), array( 'link_id' => $link->link_id ) );
}
}
- $active_plugins = __get_option('active_plugins');
+ $active_plugins = __get_option( 'active_plugins' );
/*
* If plugins are not stored in an array, they're stored in the old
* newline separated format. Convert to new format.
*/
- if ( !is_array( $active_plugins ) ) {
- $active_plugins = explode("\n", trim($active_plugins));
- update_option('active_plugins', $active_plugins);
+ if ( ! is_array( $active_plugins ) ) {
+ $active_plugins = explode( "\n", trim( $active_plugins ) );
+ update_option( 'active_plugins', $active_plugins );
}
// Obsolete tables
- $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optionvalues');
- $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiontypes');
- $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroups');
- $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroup_options');
+ $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optionvalues' );
+ $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiontypes' );
+ $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroups' );
+ $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroup_options' );
// Update comments table to use comment_type
- $wpdb->query("UPDATE $wpdb->comments SET comment_type='trackback', comment_content = REPLACE(comment_content, '<trackback />', '') WHERE comment_content LIKE '<trackback />%'");
- $wpdb->query("UPDATE $wpdb->comments SET comment_type='pingback', comment_content = REPLACE(comment_content, '<pingback />', '') WHERE comment_content LIKE '<pingback />%'");
+ $wpdb->query( "UPDATE $wpdb->comments SET comment_type='trackback', comment_content = REPLACE(comment_content, '<trackback />', '') WHERE comment_content LIKE '<trackback />%'" );
+ $wpdb->query( "UPDATE $wpdb->comments SET comment_type='pingback', comment_content = REPLACE(comment_content, '<pingback />', '') WHERE comment_content LIKE '<pingback />%'" );
// Some versions have multiple duplicate option_name rows with the same values
- $options = $wpdb->get_results("SELECT option_name, COUNT(option_name) AS dupes FROM `$wpdb->options` GROUP BY option_name");
+ $options = $wpdb->get_results( "SELECT option_name, COUNT(option_name) AS dupes FROM `$wpdb->options` GROUP BY option_name" );
foreach ( $options as $option ) {
if ( 1 != $option->dupes ) { // Could this be done in the query?
- $limit = $option->dupes - 1;
- $dupe_ids = $wpdb->get_col( $wpdb->prepare("SELECT option_id FROM $wpdb->options WHERE option_name = %s LIMIT %d", $option->option_name, $limit) );
+ $limit = $option->dupes - 1;
+ $dupe_ids = $wpdb->get_col( $wpdb->prepare( "SELECT option_id FROM $wpdb->options WHERE option_name = %s LIMIT %d", $option->option_name, $limit ) );
if ( $dupe_ids ) {
- $dupe_ids = join($dupe_ids, ',');
- $wpdb->query("DELETE FROM $wpdb->options WHERE option_id IN ($dupe_ids)");
+ $dupe_ids = join( $dupe_ids, ',' );
+ $wpdb->query( "DELETE FROM $wpdb->options WHERE option_id IN ($dupe_ids)" );
}
}
}
@@ -866,75 +1074,107 @@
populate_roles_160();
- $users = $wpdb->get_results("SELECT * FROM $wpdb->users");
+ $users = $wpdb->get_results( "SELECT * FROM $wpdb->users" );
foreach ( $users as $user ) :
- if ( !empty( $user->user_firstname ) )
- update_user_meta( $user->ID, 'first_name', wp_slash($user->user_firstname) );
- if ( !empty( $user->user_lastname ) )
- update_user_meta( $user->ID, 'last_name', wp_slash($user->user_lastname) );
- if ( !empty( $user->user_nickname ) )
- update_user_meta( $user->ID, 'nickname', wp_slash($user->user_nickname) );
- if ( !empty( $user->user_level ) )
+ if ( ! empty( $user->user_firstname ) ) {
+ update_user_meta( $user->ID, 'first_name', wp_slash( $user->user_firstname ) );
+ }
+ if ( ! empty( $user->user_lastname ) ) {
+ update_user_meta( $user->ID, 'last_name', wp_slash( $user->user_lastname ) );
+ }
+ if ( ! empty( $user->user_nickname ) ) {
+ update_user_meta( $user->ID, 'nickname', wp_slash( $user->user_nickname ) );
+ }
+ if ( ! empty( $user->user_level ) ) {
update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
- if ( !empty( $user->user_icq ) )
- update_user_meta( $user->ID, 'icq', wp_slash($user->user_icq) );
- if ( !empty( $user->user_aim ) )
- update_user_meta( $user->ID, 'aim', wp_slash($user->user_aim) );
- if ( !empty( $user->user_msn ) )
- update_user_meta( $user->ID, 'msn', wp_slash($user->user_msn) );
- if ( !empty( $user->user_yim ) )
- update_user_meta( $user->ID, 'yim', wp_slash($user->user_icq) );
- if ( !empty( $user->user_description ) )
- update_user_meta( $user->ID, 'description', wp_slash($user->user_description) );
-
- if ( isset( $user->user_idmode ) ):
+ }
+ if ( ! empty( $user->user_icq ) ) {
+ update_user_meta( $user->ID, 'icq', wp_slash( $user->user_icq ) );
+ }
+ if ( ! empty( $user->user_aim ) ) {
+ update_user_meta( $user->ID, 'aim', wp_slash( $user->user_aim ) );
+ }
+ if ( ! empty( $user->user_msn ) ) {
+ update_user_meta( $user->ID, 'msn', wp_slash( $user->user_msn ) );
+ }
+ if ( ! empty( $user->user_yim ) ) {
+ update_user_meta( $user->ID, 'yim', wp_slash( $user->user_icq ) );
+ }
+ if ( ! empty( $user->user_description ) ) {
+ update_user_meta( $user->ID, 'description', wp_slash( $user->user_description ) );
+ }
+
+ if ( isset( $user->user_idmode ) ) :
$idmode = $user->user_idmode;
- if ($idmode == 'nickname') $id = $user->user_nickname;
- if ($idmode == 'login') $id = $user->user_login;
- if ($idmode == 'firstname') $id = $user->user_firstname;
- if ($idmode == 'lastname') $id = $user->user_lastname;
- if ($idmode == 'namefl') $id = $user->user_firstname.' '.$user->user_lastname;
- if ($idmode == 'namelf') $id = $user->user_lastname.' '.$user->user_firstname;
- if (!$idmode) $id = $user->user_nickname;
- $wpdb->update( $wpdb->users, array('display_name' => $id), array('ID' => $user->ID) );
+ if ( $idmode == 'nickname' ) {
+ $id = $user->user_nickname;
+ }
+ if ( $idmode == 'login' ) {
+ $id = $user->user_login;
+ }
+ if ( $idmode == 'firstname' ) {
+ $id = $user->user_firstname;
+ }
+ if ( $idmode == 'lastname' ) {
+ $id = $user->user_lastname;
+ }
+ if ( $idmode == 'namefl' ) {
+ $id = $user->user_firstname . ' ' . $user->user_lastname;
+ }
+ if ( $idmode == 'namelf' ) {
+ $id = $user->user_lastname . ' ' . $user->user_firstname;
+ }
+ if ( ! $idmode ) {
+ $id = $user->user_nickname;
+ }
+ $wpdb->update( $wpdb->users, array( 'display_name' => $id ), array( 'ID' => $user->ID ) );
endif;
// FIXME: RESET_CAPS is temporary code to reset roles and caps if flag is set.
- $caps = get_user_meta( $user->ID, $wpdb->prefix . 'capabilities');
- if ( empty($caps) || defined('RESET_CAPS') ) {
- $level = get_user_meta($user->ID, $wpdb->prefix . 'user_level', true);
- $role = translate_level_to_role($level);
- update_user_meta( $user->ID, $wpdb->prefix . 'capabilities', array($role => true) );
+ $caps = get_user_meta( $user->ID, $wpdb->prefix . 'capabilities' );
+ if ( empty( $caps ) || defined( 'RESET_CAPS' ) ) {
+ $level = get_user_meta( $user->ID, $wpdb->prefix . 'user_level', true );
+ $role = translate_level_to_role( $level );
+ update_user_meta( $user->ID, $wpdb->prefix . 'capabilities', array( $role => true ) );
}
endforeach;
$old_user_fields = array( 'user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname', 'user_level' );
$wpdb->hide_errors();
- foreach ( $old_user_fields as $old )
- $wpdb->query("ALTER TABLE $wpdb->users DROP $old");
+ foreach ( $old_user_fields as $old ) {
+ $wpdb->query( "ALTER TABLE $wpdb->users DROP $old" );
+ }
$wpdb->show_errors();
// Populate comment_count field of posts table.
$comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" );
- if ( is_array( $comments ) )
- foreach ($comments as $comment)
- $wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) );
+ if ( is_array( $comments ) ) {
+ foreach ( $comments as $comment ) {
+ $wpdb->update( $wpdb->posts, array( 'comment_count' => $comment->c ), array( 'ID' => $comment->comment_post_ID ) );
+ }
+ }
/*
* Some alpha versions used a post status of object instead of attachment
* and put the mime type in post_type instead of post_mime_type.
*/
if ( $wp_current_db_version > 2541 && $wp_current_db_version <= 3091 ) {
- $objects = $wpdb->get_results("SELECT ID, post_type FROM $wpdb->posts WHERE post_status = 'object'");
- foreach ($objects as $object) {
- $wpdb->update( $wpdb->posts, array( 'post_status' => 'attachment',
- 'post_mime_type' => $object->post_type,
- 'post_type' => ''),
- array( 'ID' => $object->ID ) );
-
- $meta = get_post_meta($object->ID, 'imagedata', true);
- if ( ! empty($meta['file']) )
+ $objects = $wpdb->get_results( "SELECT ID, post_type FROM $wpdb->posts WHERE post_status = 'object'" );
+ foreach ( $objects as $object ) {
+ $wpdb->update(
+ $wpdb->posts,
+ array(
+ 'post_status' => 'attachment',
+ 'post_mime_type' => $object->post_type,
+ 'post_type' => '',
+ ),
+ array( 'ID' => $object->ID )
+ );
+
+ $meta = get_post_meta( $object->ID, 'imagedata', true );
+ if ( ! empty( $meta['file'] ) ) {
update_attached_file( $object->ID, $meta['file'] );
+ }
}
}
}
@@ -953,21 +1193,23 @@
if ( $wp_current_db_version < 3506 ) {
// Update status and type.
- $posts = $wpdb->get_results("SELECT ID, post_status FROM $wpdb->posts");
-
- if ( ! empty($posts) ) foreach ($posts as $post) {
- $status = $post->post_status;
- $type = 'post';
-
- if ( 'static' == $status ) {
- $status = 'publish';
- $type = 'page';
- } elseif ( 'attachment' == $status ) {
- $status = 'inherit';
- $type = 'attachment';
+ $posts = $wpdb->get_results( "SELECT ID, post_status FROM $wpdb->posts" );
+
+ if ( ! empty( $posts ) ) {
+ foreach ( $posts as $post ) {
+ $status = $post->post_status;
+ $type = 'post';
+
+ if ( 'static' == $status ) {
+ $status = 'publish';
+ $type = 'page';
+ } elseif ( 'attachment' == $status ) {
+ $status = 'inherit';
+ $type = 'attachment';
+ }
+
+ $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_status = %s, post_type = %s WHERE ID = %d", $status, $type, $post->ID ) );
}
-
- $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_status = %s, post_type = %s WHERE ID = %d", $status, $type, $post->ID) );
}
}
@@ -977,13 +1219,15 @@
if ( $wp_current_db_version < 3531 ) {
// Give future posts a post_status of future.
- $now = gmdate('Y-m-d H:i:59');
- $wpdb->query ("UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'");
-
- $posts = $wpdb->get_results("SELECT ID, post_date FROM $wpdb->posts WHERE post_status ='future'");
- if ( !empty($posts) )
- foreach ( $posts as $post )
- wp_schedule_single_event(mysql2date('U', $post->post_date, false), 'publish_future_post', array($post->ID));
+ $now = gmdate( 'Y-m-d H:i:59' );
+ $wpdb->query( "UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'" );
+
+ $posts = $wpdb->get_results( "SELECT ID, post_date FROM $wpdb->posts WHERE post_status ='future'" );
+ if ( ! empty( $posts ) ) {
+ foreach ( $posts as $post ) {
+ wp_schedule_single_event( mysql2date( 'U', $post->post_date, false ), 'publish_future_post', array( $post->ID ) );
+ }
+ }
}
}
@@ -1004,86 +1248,103 @@
}
// Convert categories to terms.
- $tt_ids = array();
- $have_tags = false;
- $categories = $wpdb->get_results("SELECT * FROM $wpdb->categories ORDER BY cat_ID");
- foreach ($categories as $category) {
- $term_id = (int) $category->cat_ID;
- $name = $category->cat_name;
+ $tt_ids = array();
+ $have_tags = false;
+ $categories = $wpdb->get_results( "SELECT * FROM $wpdb->categories ORDER BY cat_ID" );
+ foreach ( $categories as $category ) {
+ $term_id = (int) $category->cat_ID;
+ $name = $category->cat_name;
$description = $category->category_description;
- $slug = $category->category_nicename;
- $parent = $category->category_parent;
- $term_group = 0;
+ $slug = $category->category_nicename;
+ $parent = $category->category_parent;
+ $term_group = 0;
// Associate terms with the same slug in a term group and make slugs unique.
- if ( $exists = $wpdb->get_results( $wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug) ) ) {
+ if ( $exists = $wpdb->get_results( $wpdb->prepare( "SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug ) ) ) {
$term_group = $exists[0]->term_group;
- $id = $exists[0]->term_id;
- $num = 2;
+ $id = $exists[0]->term_id;
+ $num = 2;
do {
$alt_slug = $slug . "-$num";
$num++;
- $slug_check = $wpdb->get_var( $wpdb->prepare("SELECT slug FROM $wpdb->terms WHERE slug = %s", $alt_slug) );
+ $slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $alt_slug ) );
} while ( $slug_check );
$slug = $alt_slug;
if ( empty( $term_group ) ) {
- $term_group = $wpdb->get_var("SELECT MAX(term_group) FROM $wpdb->terms GROUP BY term_group") + 1;
- $wpdb->query( $wpdb->prepare("UPDATE $wpdb->terms SET term_group = %d WHERE term_id = %d", $term_group, $id) );
+ $term_group = $wpdb->get_var( "SELECT MAX(term_group) FROM $wpdb->terms GROUP BY term_group" ) + 1;
+ $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->terms SET term_group = %d WHERE term_id = %d", $term_group, $id ) );
}
}
- $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES
- (%d, %s, %s, %d)", $term_id, $name, $slug, $term_group) );
+ $wpdb->query(
+ $wpdb->prepare(
+ "INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES
+ (%d, %s, %s, %d)",
+ $term_id,
+ $name,
+ $slug,
+ $term_group
+ )
+ );
$count = 0;
- if ( !empty($category->category_count) ) {
- $count = (int) $category->category_count;
+ if ( ! empty( $category->category_count ) ) {
+ $count = (int) $category->category_count;
$taxonomy = 'category';
- $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count) );
- $tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
+ $wpdb->query( $wpdb->prepare( "INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count ) );
+ $tt_ids[ $term_id ][ $taxonomy ] = (int) $wpdb->insert_id;
}
- if ( !empty($category->link_count) ) {
- $count = (int) $category->link_count;
+ if ( ! empty( $category->link_count ) ) {
+ $count = (int) $category->link_count;
$taxonomy = 'link_category';
- $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count) );
- $tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
+ $wpdb->query( $wpdb->prepare( "INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count ) );
+ $tt_ids[ $term_id ][ $taxonomy ] = (int) $wpdb->insert_id;
}
- if ( !empty($category->tag_count) ) {
+ if ( ! empty( $category->tag_count ) ) {
$have_tags = true;
- $count = (int) $category->tag_count;
- $taxonomy = 'post_tag';
- $wpdb->insert( $wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count') );
- $tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
+ $count = (int) $category->tag_count;
+ $taxonomy = 'post_tag';
+ $wpdb->insert( $wpdb->term_taxonomy, compact( 'term_id', 'taxonomy', 'description', 'parent', 'count' ) );
+ $tt_ids[ $term_id ][ $taxonomy ] = (int) $wpdb->insert_id;
}
- if ( empty($count) ) {
- $count = 0;
+ if ( empty( $count ) ) {
+ $count = 0;
$taxonomy = 'category';
- $wpdb->insert( $wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count') );
- $tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
+ $wpdb->insert( $wpdb->term_taxonomy, compact( 'term_id', 'taxonomy', 'description', 'parent', 'count' ) );
+ $tt_ids[ $term_id ][ $taxonomy ] = (int) $wpdb->insert_id;
}
}
$select = 'post_id, category_id';
- if ( $have_tags )
+ if ( $have_tags ) {
$select .= ', rel_type';
-
- $posts = $wpdb->get_results("SELECT $select FROM $wpdb->post2cat GROUP BY post_id, category_id");
+ }
+
+ $posts = $wpdb->get_results( "SELECT $select FROM $wpdb->post2cat GROUP BY post_id, category_id" );
foreach ( $posts as $post ) {
- $post_id = (int) $post->post_id;
- $term_id = (int) $post->category_id;
+ $post_id = (int) $post->post_id;
+ $term_id = (int) $post->category_id;
$taxonomy = 'category';
- if ( !empty($post->rel_type) && 'tag' == $post->rel_type)
+ if ( ! empty( $post->rel_type ) && 'tag' == $post->rel_type ) {
$taxonomy = 'tag';
- $tt_id = $tt_ids[$term_id][$taxonomy];
- if ( empty($tt_id) )
+ }
+ $tt_id = $tt_ids[ $term_id ][ $taxonomy ];
+ if ( empty( $tt_id ) ) {
continue;
-
- $wpdb->insert( $wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id) );
+ }
+
+ $wpdb->insert(
+ $wpdb->term_relationships,
+ array(
+ 'object_id' => $post_id,
+ 'term_taxonomy_id' => $tt_id,
+ )
+ );
}
// < 3570 we used linkcategories. >= 3570 we used categories and link2cat.
@@ -1092,78 +1353,106 @@
* Create link_category terms for link categories. Create a map of link
* cat IDs to link_category terms.
*/
- $link_cat_id_map = array();
+ $link_cat_id_map = array();
$default_link_cat = 0;
- $tt_ids = array();
- $link_cats = $wpdb->get_results("SELECT cat_id, cat_name FROM " . $wpdb->prefix . 'linkcategories');
- foreach ( $link_cats as $category) {
- $cat_id = (int) $category->cat_id;
- $term_id = 0;
- $name = wp_slash($category->cat_name);
- $slug = sanitize_title($name);
+ $tt_ids = array();
+ $link_cats = $wpdb->get_results( 'SELECT cat_id, cat_name FROM ' . $wpdb->prefix . 'linkcategories' );
+ foreach ( $link_cats as $category ) {
+ $cat_id = (int) $category->cat_id;
+ $term_id = 0;
+ $name = wp_slash( $category->cat_name );
+ $slug = sanitize_title( $name );
$term_group = 0;
// Associate terms with the same slug in a term group and make slugs unique.
- if ( $exists = $wpdb->get_results( $wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug) ) ) {
+ if ( $exists = $wpdb->get_results( $wpdb->prepare( "SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug ) ) ) {
$term_group = $exists[0]->term_group;
- $term_id = $exists[0]->term_id;
+ $term_id = $exists[0]->term_id;
}
- if ( empty($term_id) ) {
- $wpdb->insert( $wpdb->terms, compact('name', 'slug', 'term_group') );
+ if ( empty( $term_id ) ) {
+ $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) );
$term_id = (int) $wpdb->insert_id;
}
- $link_cat_id_map[$cat_id] = $term_id;
- $default_link_cat = $term_id;
-
- $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $term_id, 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 0) );
- $tt_ids[$term_id] = (int) $wpdb->insert_id;
+ $link_cat_id_map[ $cat_id ] = $term_id;
+ $default_link_cat = $term_id;
+
+ $wpdb->insert(
+ $wpdb->term_taxonomy,
+ array(
+ 'term_id' => $term_id,
+ 'taxonomy' => 'link_category',
+ 'description' => '',
+ 'parent' => 0,
+ 'count' => 0,
+ )
+ );
+ $tt_ids[ $term_id ] = (int) $wpdb->insert_id;
}
// Associate links to cats.
- $links = $wpdb->get_results("SELECT link_id, link_category FROM $wpdb->links");
- if ( !empty($links) ) foreach ( $links as $link ) {
- if ( 0 == $link->link_category )
- continue;
- if ( ! isset($link_cat_id_map[$link->link_category]) )
- continue;
- $term_id = $link_cat_id_map[$link->link_category];
- $tt_id = $tt_ids[$term_id];
- if ( empty($tt_id) )
- continue;
-
- $wpdb->insert( $wpdb->term_relationships, array('object_id' => $link->link_id, 'term_taxonomy_id' => $tt_id) );
+ $links = $wpdb->get_results( "SELECT link_id, link_category FROM $wpdb->links" );
+ if ( ! empty( $links ) ) {
+ foreach ( $links as $link ) {
+ if ( 0 == $link->link_category ) {
+ continue;
+ }
+ if ( ! isset( $link_cat_id_map[ $link->link_category ] ) ) {
+ continue;
+ }
+ $term_id = $link_cat_id_map[ $link->link_category ];
+ $tt_id = $tt_ids[ $term_id ];
+ if ( empty( $tt_id ) ) {
+ continue;
+ }
+
+ $wpdb->insert(
+ $wpdb->term_relationships,
+ array(
+ 'object_id' => $link->link_id,
+ 'term_taxonomy_id' => $tt_id,
+ )
+ );
+ }
}
// Set default to the last category we grabbed during the upgrade loop.
- update_option('default_link_category', $default_link_cat);
+ update_option( 'default_link_category', $default_link_cat );
} else {
- $links = $wpdb->get_results("SELECT link_id, category_id FROM $wpdb->link2cat GROUP BY link_id, category_id");
+ $links = $wpdb->get_results( "SELECT link_id, category_id FROM $wpdb->link2cat GROUP BY link_id, category_id" );
foreach ( $links as $link ) {
- $link_id = (int) $link->link_id;
- $term_id = (int) $link->category_id;
+ $link_id = (int) $link->link_id;
+ $term_id = (int) $link->category_id;
$taxonomy = 'link_category';
- $tt_id = $tt_ids[$term_id][$taxonomy];
- if ( empty($tt_id) )
+ $tt_id = $tt_ids[ $term_id ][ $taxonomy ];
+ if ( empty( $tt_id ) ) {
continue;
- $wpdb->insert( $wpdb->term_relationships, array('object_id' => $link_id, 'term_taxonomy_id' => $tt_id) );
+ }
+ $wpdb->insert(
+ $wpdb->term_relationships,
+ array(
+ 'object_id' => $link_id,
+ 'term_taxonomy_id' => $tt_id,
+ )
+ );
}
}
if ( $wp_current_db_version < 4772 ) {
// Obsolete linkcategories table
- $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'linkcategories');
+ $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'linkcategories' );
}
// Recalculate all counts
- $terms = $wpdb->get_results("SELECT term_taxonomy_id, taxonomy FROM $wpdb->term_taxonomy");
+ $terms = $wpdb->get_results( "SELECT term_taxonomy_id, taxonomy FROM $wpdb->term_taxonomy" );
foreach ( (array) $terms as $term ) {
- if ( ('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy) )
- $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id) );
- else
- $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id) );
- $wpdb->update( $wpdb->term_taxonomy, array('count' => $count), array('term_taxonomy_id' => $term->term_taxonomy_id) );
+ if ( ( 'post_tag' == $term->taxonomy ) || ( 'category' == $term->taxonomy ) ) {
+ $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id ) );
+ } else {
+ $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id ) );
+ }
+ $wpdb->update( $wpdb->term_taxonomy, array( 'count' => $count ), array( 'term_taxonomy_id' => $term->term_taxonomy_id ) );
}
}
@@ -1179,8 +1468,9 @@
global $wpdb;
$old_options_fields = array( 'option_can_override', 'option_type', 'option_width', 'option_height', 'option_description', 'option_admin_level' );
$wpdb->hide_errors();
- foreach ( $old_options_fields as $old )
- $wpdb->query("ALTER TABLE $wpdb->options DROP $old");
+ foreach ( $old_options_fields as $old ) {
+ $wpdb->query( "ALTER TABLE $wpdb->options DROP $old" );
+ }
$wpdb->show_errors();
}
@@ -1194,9 +1484,9 @@
*/
function upgrade_230_old_tables() {
global $wpdb;
- $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'categories');
- $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'link2cat');
- $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'post2cat');
+ $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'categories' );
+ $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'link2cat' );
+ $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'post2cat' );
}
/**
@@ -1210,7 +1500,7 @@
function upgrade_old_slugs() {
// Upgrade people who were using the Redirect Old Slugs plugin.
global $wpdb;
- $wpdb->query("UPDATE $wpdb->postmeta SET meta_key = '_wp_old_slug' WHERE meta_key = 'old_slug'");
+ $wpdb->query( "UPDATE $wpdb->postmeta SET meta_key = '_wp_old_slug' WHERE meta_key = 'old_slug'" );
}
/**
@@ -1241,7 +1531,7 @@
function upgrade_252() {
global $wpdb;
- $wpdb->query("UPDATE $wpdb->users SET user_activation_key = ''");
+ $wpdb->query( "UPDATE $wpdb->users SET user_activation_key = ''" );
}
/**
@@ -1255,8 +1545,9 @@
function upgrade_260() {
global $wp_current_db_version;
- if ( $wp_current_db_version < 8000 )
+ if ( $wp_current_db_version < 8000 ) {
populate_roles_260();
+ }
}
/**
@@ -1271,12 +1562,14 @@
function upgrade_270() {
global $wpdb, $wp_current_db_version;
- if ( $wp_current_db_version < 8980 )
+ if ( $wp_current_db_version < 8980 ) {
populate_roles_270();
+ }
// Update post_date for unpublished posts with empty timestamp
- if ( $wp_current_db_version < 8921 )
+ if ( $wp_current_db_version < 8921 ) {
$wpdb->query( "UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'" );
+ }
}
/**
@@ -1291,15 +1584,17 @@
function upgrade_280() {
global $wp_current_db_version, $wpdb;
- if ( $wp_current_db_version < 10360 )
+ if ( $wp_current_db_version < 10360 ) {
populate_roles_280();
+ }
if ( is_multisite() ) {
$start = 0;
- while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
+ while ( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
foreach ( $rows as $row ) {
$value = $row->option_value;
- if ( !@unserialize( $value ) )
+ if ( ! @unserialize( $value ) ) {
$value = stripslashes( $value );
+ }
if ( $value !== $row->option_value ) {
update_option( $row->option_name, $value );
}
@@ -1342,15 +1637,17 @@
function upgrade_300() {
global $wp_current_db_version, $wpdb;
- if ( $wp_current_db_version < 15093 )
+ if ( $wp_current_db_version < 15093 ) {
populate_roles_300();
-
- if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
+ }
+
+ if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false ) {
add_site_option( 'siteurl', '' );
+ }
// 3.0 screen options key name changes.
if ( wp_should_upgrade_global_tables() ) {
- $sql = "DELETE FROM $wpdb->usermeta
+ $sql = "DELETE FROM $wpdb->usermeta
WHERE meta_key LIKE %s
OR meta_key LIKE %s
OR meta_key LIKE %s
@@ -1364,14 +1661,17 @@
OR meta_key = 'categories_per_page'
OR meta_key = 'edit_tags_per_page'";
$prefix = $wpdb->esc_like( $wpdb->base_prefix );
- $wpdb->query( $wpdb->prepare( $sql,
- $prefix . '%' . $wpdb->esc_like( 'meta-box-hidden' ) . '%',
- $prefix . '%' . $wpdb->esc_like( 'closedpostboxes' ) . '%',
- $prefix . '%' . $wpdb->esc_like( 'manage-' ) . '%' . $wpdb->esc_like( '-columns-hidden' ) . '%',
- $prefix . '%' . $wpdb->esc_like( 'meta-box-order' ) . '%',
- $prefix . '%' . $wpdb->esc_like( 'metaboxorder' ) . '%',
- $prefix . '%' . $wpdb->esc_like( 'screen_layout' ) . '%'
- ) );
+ $wpdb->query(
+ $wpdb->prepare(
+ $sql,
+ $prefix . '%' . $wpdb->esc_like( 'meta-box-hidden' ) . '%',
+ $prefix . '%' . $wpdb->esc_like( 'closedpostboxes' ) . '%',
+ $prefix . '%' . $wpdb->esc_like( 'manage-' ) . '%' . $wpdb->esc_like( '-columns-hidden' ) . '%',
+ $prefix . '%' . $wpdb->esc_like( 'meta-box-order' ) . '%',
+ $prefix . '%' . $wpdb->esc_like( 'metaboxorder' ) . '%',
+ $prefix . '%' . $wpdb->esc_like( 'screen_layout' ) . '%'
+ )
+ );
}
}
@@ -1394,58 +1694,64 @@
$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" );
}
- if ( $wp_current_db_version >= 11548 )
+ if ( $wp_current_db_version >= 11548 ) {
return;
-
- $sidebars_widgets = get_option( 'sidebars_widgets', array() );
+ }
+
+ $sidebars_widgets = get_option( 'sidebars_widgets', array() );
$_sidebars_widgets = array();
- if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) )
+ if ( isset( $sidebars_widgets['wp_inactive_widgets'] ) || empty( $sidebars_widgets ) ) {
$sidebars_widgets['array_version'] = 3;
- elseif ( !isset($sidebars_widgets['array_version']) )
+ } elseif ( ! isset( $sidebars_widgets['array_version'] ) ) {
$sidebars_widgets['array_version'] = 1;
+ }
switch ( $sidebars_widgets['array_version'] ) {
- case 1 :
- foreach ( (array) $sidebars_widgets as $index => $sidebar )
- if ( is_array($sidebar) )
- foreach ( (array) $sidebar as $i => $name ) {
- $id = strtolower($name);
- if ( isset($wp_registered_widgets[$id]) ) {
- $_sidebars_widgets[$index][$i] = $id;
- continue;
- }
- $id = sanitize_title($name);
- if ( isset($wp_registered_widgets[$id]) ) {
- $_sidebars_widgets[$index][$i] = $id;
- continue;
- }
-
- $found = false;
-
- foreach ( $wp_registered_widgets as $widget_id => $widget ) {
- if ( strtolower($widget['name']) == strtolower($name) ) {
- $_sidebars_widgets[$index][$i] = $widget['id'];
- $found = true;
- break;
- } elseif ( sanitize_title($widget['name']) == sanitize_title($name) ) {
- $_sidebars_widgets[$index][$i] = $widget['id'];
- $found = true;
- break;
+ case 1:
+ foreach ( (array) $sidebars_widgets as $index => $sidebar ) {
+ if ( is_array( $sidebar ) ) {
+ foreach ( (array) $sidebar as $i => $name ) {
+ $id = strtolower( $name );
+ if ( isset( $wp_registered_widgets[ $id ] ) ) {
+ $_sidebars_widgets[ $index ][ $i ] = $id;
+ continue;
+ }
+ $id = sanitize_title( $name );
+ if ( isset( $wp_registered_widgets[ $id ] ) ) {
+ $_sidebars_widgets[ $index ][ $i ] = $id;
+ continue;
+ }
+
+ $found = false;
+
+ foreach ( $wp_registered_widgets as $widget_id => $widget ) {
+ if ( strtolower( $widget['name'] ) == strtolower( $name ) ) {
+ $_sidebars_widgets[ $index ][ $i ] = $widget['id'];
+ $found = true;
+ break;
+ } elseif ( sanitize_title( $widget['name'] ) == sanitize_title( $name ) ) {
+ $_sidebars_widgets[ $index ][ $i ] = $widget['id'];
+ $found = true;
+ break;
+ }
+ }
+
+ if ( $found ) {
+ continue;
+ }
+
+ unset( $_sidebars_widgets[ $index ][ $i ] );
}
}
-
- if ( $found )
- continue;
-
- unset($_sidebars_widgets[$index][$i]);
}
$_sidebars_widgets['array_version'] = 2;
- $sidebars_widgets = $_sidebars_widgets;
- unset($_sidebars_widgets);
-
- case 2 :
- $sidebars_widgets = retrieve_widgets();
+ $sidebars_widgets = $_sidebars_widgets;
+ unset( $_sidebars_widgets );
+
+ // intentional fall-through to upgrade to the next version.
+ case 2:
+ $sidebars_widgets = retrieve_widgets();
$sidebars_widgets['array_version'] = 3;
update_option( 'sidebars_widgets', $sidebars_widgets );
}
@@ -1471,7 +1777,7 @@
if ( $wp_current_db_version < 19799 ) {
$wpdb->hide_errors();
- $wpdb->query("ALTER TABLE $wpdb->comments DROP INDEX comment_approved");
+ $wpdb->query( "ALTER TABLE $wpdb->comments DROP INDEX comment_approved" );
$wpdb->show_errors();
}
@@ -1500,14 +1806,16 @@
function upgrade_350() {
global $wp_current_db_version, $wpdb;
- if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
+ if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) ) {
update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options()
+ }
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, '-' ) )
- $meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+ if ( false !== strpos( $name, '-' ) ) {
+ $meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+ }
}
if ( $meta_keys ) {
$meta_keys = implode( "', '", $meta_keys );
@@ -1515,8 +1823,9 @@
}
}
- if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) )
+ if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) ) {
wp_delete_term( $term->term_id, 'post_format' );
+ }
}
/**
@@ -1529,8 +1838,9 @@
*/
function upgrade_370() {
global $wp_current_db_version;
- if ( $wp_current_db_version < 25824 )
+ if ( $wp_current_db_version < 25824 ) {
wp_clear_scheduled_hook( 'wp_auto_updates_maybe_update' );
+ }
}
/**
@@ -1544,8 +1854,9 @@
*/
function upgrade_372() {
global $wp_current_db_version;
- if ( $wp_current_db_version < 26148 )
+ if ( $wp_current_db_version < 26148 ) {
wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
+ }
}
/**
@@ -1624,7 +1935,7 @@
$tables = $wpdb->tables( 'all' );
if ( ! wp_should_upgrade_global_tables() ) {
$global_tables = $wpdb->tables( 'global' );
- $tables = array_diff_assoc( $tables, $global_tables );
+ $tables = array_diff_assoc( $tables, $global_tables );
}
}
@@ -1658,10 +1969,10 @@
'length' => 65535,
);
} elseif ( ! is_array( $content_length ) ) {
- $length = (int) $content_length > 0 ? (int) $content_length : 65535;
+ $length = (int) $content_length > 0 ? (int) $content_length : 65535;
$content_length = array(
- 'type' => 'byte',
- 'length' => $length
+ 'type' => 'byte',
+ 'length' => $length,
);
}
@@ -1782,6 +2093,26 @@
}
/**
+ * Executes changes made in WordPress 5.0.0.
+ *
+ * @ignore
+ * @since 5.0.0
+ * @deprecated 5.1.0
+ */
+function upgrade_500() {
+}
+
+/**
+ * Executes changes made in WordPress 5.1.0.
+ *
+ * @ignore
+ * @since 5.1.0
+ */
+function upgrade_510() {
+ delete_site_option( 'upgrade_500_was_gutenberg_active' );
+}
+
+/**
* Executes network-level upgrade routines.
*
* @since 3.0.0
@@ -1797,13 +2128,14 @@
// 2.8.
if ( $wp_current_db_version < 11549 ) {
- $wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
+ $wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
$active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
if ( $wpmu_sitewide_plugins ) {
- if ( !$active_sitewide_plugins )
+ if ( ! $active_sitewide_plugins ) {
$sitewide_plugins = (array) $wpmu_sitewide_plugins;
- else
+ } else {
$sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
+ }
update_site_option( 'active_sitewide_plugins', $sitewide_plugins );
}
@@ -1811,11 +2143,12 @@
delete_site_option( 'deactivated_sitewide_plugins' );
$start = 0;
- while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
+ while ( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
foreach ( $rows as $row ) {
$value = $row->meta_value;
- if ( !@unserialize( $value ) )
+ if ( ! @unserialize( $value ) ) {
$value = stripslashes( $value );
+ }
if ( $value !== $row->meta_value ) {
update_site_option( $row->meta_key, $value );
}
@@ -1825,29 +2158,33 @@
}
// 3.0
- if ( $wp_current_db_version < 13576 )
+ if ( $wp_current_db_version < 13576 ) {
update_site_option( 'global_terms_enabled', '1' );
+ }
// 3.3
- if ( $wp_current_db_version < 19390 )
+ if ( $wp_current_db_version < 19390 ) {
update_site_option( 'initial_db_version', $wp_current_db_version );
+ }
if ( $wp_current_db_version < 19470 ) {
- if ( false === get_site_option( 'active_sitewide_plugins' ) )
+ if ( false === get_site_option( 'active_sitewide_plugins' ) ) {
update_site_option( 'active_sitewide_plugins', array() );
+ }
}
// 3.4
if ( $wp_current_db_version < 20148 ) {
// 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
- $allowedthemes = get_site_option( 'allowedthemes' );
+ $allowedthemes = get_site_option( 'allowedthemes' );
$allowed_themes = get_site_option( 'allowed_themes' );
if ( false === $allowedthemes && is_array( $allowed_themes ) && $allowed_themes ) {
$converted = array();
- $themes = wp_get_themes();
+ $themes = wp_get_themes();
foreach ( $themes as $stylesheet => $theme_data ) {
- if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) )
+ if ( isset( $allowed_themes[ $theme_data->get( 'Name' ) ] ) ) {
$converted[ $stylesheet ] = true;
+ }
}
update_site_option( 'allowedthemes', $converted );
delete_site_option( 'allowed_themes' );
@@ -1855,14 +2192,15 @@
}
// 3.5
- if ( $wp_current_db_version < 21823 )
+ if ( $wp_current_db_version < 21823 ) {
update_site_option( 'ms_files_rewriting', '1' );
+ }
// 3.5.2
if ( $wp_current_db_version < 24448 ) {
$illegal_names = get_site_option( 'illegal_names' );
if ( is_array( $illegal_names ) && count( $illegal_names ) === 1 ) {
- $illegal_name = reset( $illegal_names );
+ $illegal_name = reset( $illegal_names );
$illegal_names = explode( ' ', $illegal_name );
update_site_option( 'illegal_names', $illegal_names );
}
@@ -1917,6 +2255,13 @@
}
}
}
+
+ // 5.1
+ if ( $wp_current_db_version < 44467 ) {
+ $network_id = get_main_network_id();
+ delete_network_option( $network_id, 'site_meta_supported' );
+ is_site_meta_supported();
+ }
}
//
@@ -1938,17 +2283,17 @@
* @param string $create_ddl SQL statement to create table.
* @return bool If table already exists or was created by function.
*/
-function maybe_create_table($table_name, $create_ddl) {
+function maybe_create_table( $table_name, $create_ddl ) {
global $wpdb;
- $query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $table_name ) );
+ $query = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $table_name ) );
if ( $wpdb->get_var( $query ) == $table_name ) {
return true;
}
// Didn't find it try to create it..
- $wpdb->query($create_ddl);
+ $wpdb->query( $create_ddl );
// We cannot directly tell that whether this succeeded!
if ( $wpdb->get_var( $query ) == $table_name ) {
@@ -1968,13 +2313,13 @@
* @param string $index Index name to drop.
* @return true True, when finished.
*/
-function drop_index($table, $index) {
+function drop_index( $table, $index ) {
global $wpdb;
$wpdb->hide_errors();
- $wpdb->query("ALTER TABLE `$table` DROP INDEX `$index`");
+ $wpdb->query( "ALTER TABLE `$table` DROP INDEX `$index`" );
// Now we need to take out all the extra ones we may have created
- for ($i = 0; $i < 25; $i++) {
- $wpdb->query("ALTER TABLE `$table` DROP INDEX `{$index}_$i`");
+ for ( $i = 0; $i < 25; $i++ ) {
+ $wpdb->query( "ALTER TABLE `$table` DROP INDEX `{$index}_$i`" );
}
$wpdb->show_errors();
return true;
@@ -1991,10 +2336,10 @@
* @param string $index Database table index column.
* @return true True, when done with execution.
*/
-function add_clean_index($table, $index) {
+function add_clean_index( $table, $index ) {
global $wpdb;
- drop_index($table, $index);
- $wpdb->query("ALTER TABLE `$table` ADD INDEX ( `$index` )");
+ drop_index( $table, $index );
+ $wpdb->query( "ALTER TABLE `$table` ADD INDEX ( `$index` )" );
return true;
}
@@ -2010,20 +2355,20 @@
* @param string $create_ddl The SQL statement used to add the column.
* @return bool True if already exists or on successful completion, false on error.
*/
-function maybe_add_column($table_name, $column_name, $create_ddl) {
+function maybe_add_column( $table_name, $column_name, $create_ddl ) {
global $wpdb;
- foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
- if ($column == $column_name) {
+ foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
+ if ( $column == $column_name ) {
return true;
}
}
// Didn't find it try to create it.
- $wpdb->query($create_ddl);
+ $wpdb->query( $create_ddl );
// We cannot directly tell that whether this succeeded!
- foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
- if ($column == $column_name) {
+ foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
+ if ( $column == $column_name ) {
return true;
}
}
@@ -2051,7 +2396,7 @@
foreach ( $results as $column ) {
if ( $column->Collation ) {
list( $charset ) = explode( '_', $column->Collation );
- $charset = strtolower( $charset );
+ $charset = strtolower( $charset );
if ( 'utf8' !== $charset && 'utf8mb4' !== $charset ) {
// Don't upgrade tables that have non-utf8 columns.
return false;
@@ -2065,7 +2410,7 @@
}
list( $table_charset ) = explode( '_', $table_details->Collation );
- $table_charset = strtolower( $table_charset );
+ $table_charset = strtolower( $table_charset );
if ( 'utf8mb4' === $table_charset ) {
return true;
}
@@ -2087,8 +2432,9 @@
$all_options = new stdClass;
if ( $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" ) ) {
foreach ( $options as $option ) {
- if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name )
+ if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name ) {
$option->option_value = untrailingslashit( $option->option_value );
+ }
$all_options->{$option->option_name} = stripslashes( $option->option_value );
}
}
@@ -2107,22 +2453,26 @@
* @param string $setting Option name.
* @return mixed
*/
-function __get_option($setting) {
+function __get_option( $setting ) {
global $wpdb;
- if ( $setting == 'home' && defined( 'WP_HOME' ) )
+ if ( $setting == 'home' && defined( 'WP_HOME' ) ) {
return untrailingslashit( WP_HOME );
-
- if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) )
+ }
+
+ if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) ) {
return untrailingslashit( WP_SITEURL );
-
- $option = $wpdb->get_var( $wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting ) );
-
- if ( 'home' == $setting && '' == $option )
+ }
+
+ $option = $wpdb->get_var( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting ) );
+
+ if ( 'home' == $setting && '' == $option ) {
return __get_option( 'siteurl' );
-
- if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting )
+ }
+
+ if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting ) {
$option = untrailingslashit( $option );
+ }
return maybe_unserialize( $option );
}
@@ -2135,23 +2485,23 @@
* @param string $content The content to modify.
* @return string The de-slashed content.
*/
-function deslash($content) {
+function deslash( $content ) {
// Note: \\\ inside a regex denotes a single backslash.
/*
* Replace one or more backslashes followed by a single quote with
* a single quote.
*/
- $content = preg_replace("/\\\+'/", "'", $content);
+ $content = preg_replace( "/\\\+'/", "'", $content );
/*
* Replace one or more backslashes followed by a double quote with
* a double quote.
*/
- $content = preg_replace('/\\\+"/', '"', $content);
+ $content = preg_replace( '/\\\+"/', '"', $content );
// Replace one or more backslashes with one backslash.
- $content = preg_replace("/\\\+/", "\\", $content);
+ $content = preg_replace( '/\\\+/', '\\', $content );
return $content;
}
@@ -2165,21 +2515,22 @@
*
* @global wpdb $wpdb
*
- * @param string|array $queries Optional. The query to run. Can be multiple queries
- * in an array, or a string of queries separated by
- * semicolons. Default empty.
- * @param bool $execute Optional. Whether or not to execute the query right away.
- * Default true.
+ * @param string[]|string $queries Optional. The query to run. Can be multiple queries
+ * in an array, or a string of queries separated by
+ * semicolons. Default empty string.
+ * @param bool $execute Optional. Whether or not to execute the query right away.
+ * Default true.
* @return array Strings containing the results of the various update queries.
*/
function dbDelta( $queries = '', $execute = true ) {
global $wpdb;
- if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) )
- $queries = wp_get_db_schema( $queries );
+ if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) ) {
+ $queries = wp_get_db_schema( $queries );
+ }
// Separate individual queries into an array
- if ( !is_array($queries) ) {
+ if ( ! is_array( $queries ) ) {
$queries = explode( ';', $queries );
$queries = array_filter( $queries );
}
@@ -2189,24 +2540,24 @@
*
* @since 3.3.0
*
- * @param array $queries An array of dbDelta SQL queries.
+ * @param string[] $queries An array of dbDelta SQL queries.
*/
$queries = apply_filters( 'dbdelta_queries', $queries );
- $cqueries = array(); // Creation Queries
- $iqueries = array(); // Insertion Queries
+ $cqueries = array(); // Creation Queries
+ $iqueries = array(); // Insertion Queries
$for_update = array();
// Create a tablename index for an array ($cqueries) of queries
- foreach ($queries as $qry) {
- if ( preg_match( "|CREATE TABLE ([^ ]*)|", $qry, $matches ) ) {
+ 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 ) ) {
+ $for_update[ $matches[1] ] = 'Created table ' . $matches[1];
+ } elseif ( preg_match( '|CREATE DATABASE ([^ ]*)|', $qry, $matches ) ) {
array_unshift( $cqueries, $qry );
- } elseif ( preg_match( "|INSERT INTO ([^ ]*)|", $qry, $matches ) ) {
+ } elseif ( preg_match( '|INSERT INTO ([^ ]*)|', $qry, $matches ) ) {
$iqueries[] = $qry;
- } elseif ( preg_match( "|UPDATE ([^ ]*)|", $qry, $matches ) ) {
+ } elseif ( preg_match( '|UPDATE ([^ ]*)|', $qry, $matches ) ) {
$iqueries[] = $qry;
} else {
// Unrecognized query type
@@ -2220,7 +2571,7 @@
*
* @since 3.3.0
*
- * @param array $cqueries An array of dbDelta create SQL queries.
+ * @param string[] $cqueries An array of dbDelta create SQL queries.
*/
$cqueries = apply_filters( 'dbdelta_create_queries', $cqueries );
@@ -2231,7 +2582,7 @@
*
* @since 3.3.0
*
- * @param array $iqueries An array of dbDelta insert or update SQL queries.
+ * @param string[] $iqueries An array of dbDelta insert or update SQL queries.
*/
$iqueries = apply_filters( 'dbdelta_insert_queries', $iqueries );
@@ -2247,22 +2598,23 @@
}
// Fetch the table column structure from the database
- $suppress = $wpdb->suppress_errors();
- $tablefields = $wpdb->get_results("DESCRIBE {$table};");
+ $suppress = $wpdb->suppress_errors();
+ $tablefields = $wpdb->get_results( "DESCRIBE {$table};" );
$wpdb->suppress_errors( $suppress );
- if ( ! $tablefields )
+ if ( ! $tablefields ) {
continue;
+ }
// Clear the field and index arrays.
$cfields = $indices = $indices_without_subparts = array();
// Get all of the field names in the query from between the parentheses.
- preg_match("|\((.*)\)|ms", $qry, $match2);
- $qryline = trim($match2[1]);
+ preg_match( '|\((.*)\)|ms', $qry, $match2 );
+ $qryline = trim( $match2[1] );
// Separate field lines into an array.
- $flds = explode("\n", $qryline);
+ $flds = explode( "\n", $qryline );
// For every field line specified in the query.
foreach ( $flds as $fld ) {
@@ -2270,7 +2622,7 @@
// Extract the field name.
preg_match( '|^([^ ]*)|', $fld, $fvals );
- $fieldname = trim( $fvals[1], '`' );
+ $fieldname = trim( $fvals[1], '`' );
$fieldname_lowercased = strtolower( $fieldname );
// Verify the found field name.
@@ -2294,8 +2646,9 @@
*/
// Extract type, name and columns from the definition.
+ // phpcs:disable Squiz.Strings.ConcatenationSpacing.PaddingFound -- don't remove regex indentation
preg_match(
- '/^'
+ '/^'
. '(?P<index_type>' // 1) Type of the index.
. 'PRIMARY\s+KEY|(?:UNIQUE|FULLTEXT|SPATIAL)\s+(?:KEY|INDEX)|KEY|INDEX'
. ')'
@@ -2317,6 +2670,7 @@
$fld,
$index_matches
);
+ // phpcs:enable
// Uppercase the index type and normalize space characters.
$index_type = strtoupper( preg_replace( '/\s+/', ' ', trim( $index_matches['index_type'] ) ) );
@@ -2334,22 +2688,22 @@
foreach ( $index_columns as $id => &$index_column ) {
// Extract column name and number of indexed characters (sub_part).
preg_match(
- '/'
- . '`?' // Name can be escaped with a backtick.
- . '(?P<column_name>' // 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<sub_part>'
- . '\d+' // 2) Number of indexed characters.
- . ')'
- . '\s*' // Optional white space character before closing bracket.
- . '\)' // Closing bracket for the sub part.
- . ')?'
+ '/'
+ . '`?' // Name can be escaped with a backtick.
+ . '(?P<column_name>' // 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<sub_part>'
+ . '\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
@@ -2368,8 +2722,8 @@
}
// Build the normalized index definition and add it to the list of indices.
- $indices[] = "{$index_type} {$index_name} (" . implode( ',', $index_columns ) . ")";
- $indices_without_subparts[] = "{$index_type} {$index_name} (" . implode( ',', $index_columns_without_subparts ) . ")";
+ $indices[] = "{$index_type} {$index_name} (" . implode( ',', $index_columns ) . ')';
+ $indices_without_subparts[] = "{$index_type} {$index_name} (" . implode( ',', $index_columns_without_subparts ) . ')';
// Destroy no longer needed variables.
unset( $index_column, $index_column_matches, $index_matches, $index_type, $index_name, $index_columns, $index_columns_without_subparts );
@@ -2386,18 +2740,18 @@
// For every field in the table.
foreach ( $tablefields as $tablefield ) {
$tablefield_field_lowercased = strtolower( $tablefield->Field );
- $tablefield_type_lowercased = strtolower( $tablefield->Type );
+ $tablefield_type_lowercased = strtolower( $tablefield->Type );
// If the table field exists in the field array ...
if ( array_key_exists( $tablefield_field_lowercased, $cfields ) ) {
// Get the field type from the query.
preg_match( '|`?' . $tablefield->Field . '`? ([^ ]*( unsigned)?)|i', $cfields[ $tablefield_field_lowercased ], $matches );
- $fieldtype = $matches[1];
+ $fieldtype = $matches[1];
$fieldtype_lowercased = strtolower( $fieldtype );
// Is actual field type different from the field type in query?
- if ($tablefield->Type != $fieldtype) {
+ if ( $tablefield->Type != $fieldtype ) {
$do_change = true;
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 ) ) {
@@ -2413,18 +2767,18 @@
if ( $do_change ) {
// 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}";
+ $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.
if ( preg_match( "| DEFAULT '(.*?)'|i", $cfields[ $tablefield_field_lowercased ], $matches ) ) {
$default_value = $matches[1];
- if ($tablefield->Default != $default_value) {
+ 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}'";
- $for_update[$table.'.'.$tablefield->Field] = "Changed default value of {$table}.{$tablefield->Field} from {$tablefield->Default} to {$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}";
}
}
@@ -2436,35 +2790,38 @@
}
// For every remaining field specified for the table.
- foreach ($cfields as $fieldname => $fielddef) {
+ foreach ( $cfields as $fieldname => $fielddef ) {
// Push a query line into $cqueries that adds the field to that table.
- $cqueries[] = "ALTER TABLE {$table} ADD COLUMN $fielddef";
- $for_update[$table.'.'.$fieldname] = 'Added column '.$table.'.'.$fieldname;
+ $cqueries[] = "ALTER TABLE {$table} ADD COLUMN $fielddef";
+ $for_update[ $table . '.' . $fieldname ] = 'Added column ' . $table . '.' . $fieldname;
}
// Index stuff goes here. Fetch the table index structure from the database.
- $tableindices = $wpdb->get_results("SHOW INDEX FROM {$table};");
-
- if ($tableindices) {
+ $tableindices = $wpdb->get_results( "SHOW INDEX FROM {$table};" );
+
+ if ( $tableindices ) {
// Clear the index array.
$index_ary = array();
// For every index in the table.
- foreach ($tableindices as $tableindex) {
+ foreach ( $tableindices as $tableindex ) {
// Add the index to the index data array.
- $keyname = strtolower( $tableindex->Key_name );
- $index_ary[$keyname]['columns'][] = array('fieldname' => $tableindex->Column_name, 'subpart' => $tableindex->Sub_part);
- $index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0)?true:false;
- $index_ary[$keyname]['index_type'] = $tableindex->Index_type;
+ $keyname = strtolower( $tableindex->Key_name );
+ $index_ary[ $keyname ]['columns'][] = array(
+ 'fieldname' => $tableindex->Column_name,
+ 'subpart' => $tableindex->Sub_part,
+ );
+ $index_ary[ $keyname ]['unique'] = ( $tableindex->Non_unique == 0 ) ? true : false;
+ $index_ary[ $keyname ]['index_type'] = $tableindex->Index_type;
}
// For each actual index in the index array.
- foreach ($index_ary as $index_name => $index_data) {
+ foreach ( $index_ary as $index_name => $index_data ) {
// Build a create string to compare to the query.
$index_string = '';
- if ($index_name == 'primary') {
+ if ( $index_name == 'primary' ) {
$index_string .= 'PRIMARY ';
} elseif ( $index_data['unique'] ) {
$index_string .= 'UNIQUE ';
@@ -2476,13 +2833,13 @@
$index_string .= 'SPATIAL ';
}
$index_string .= 'KEY ';
- if ( 'primary' !== $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) {
+ foreach ( $index_data['columns'] as $column_data ) {
if ( $index_columns != '' ) {
$index_columns .= ',';
}
@@ -2506,7 +2863,7 @@
// For every remaining index specified for the table.
foreach ( (array) $indices as $index ) {
// Push a query line into $cqueries that adds the index to that table.
- $cqueries[] = "ALTER TABLE {$table} ADD $index";
+ $cqueries[] = "ALTER TABLE {$table} ADD $index";
$for_update[] = 'Added index ' . $table . ' ' . $index;
}
@@ -2514,10 +2871,10 @@
unset( $cqueries[ $table ], $for_update[ $table ] );
}
- $allqueries = array_merge($cqueries, $iqueries);
- if ($execute) {
- foreach ($allqueries as $query) {
- $wpdb->query($query);
+ $allqueries = array_merge( $cqueries, $iqueries );
+ if ( $execute ) {
+ foreach ( $allqueries as $query ) {
+ $wpdb->query( $query );
}
}
@@ -2539,7 +2896,9 @@
function make_db_current( $tables = 'all' ) {
$alterations = dbDelta( $tables );
echo "<ol>\n";
- foreach ($alterations as $alteration) echo "<li>$alteration</li>\n";
+ foreach ( $alterations as $alteration ) {
+ echo "<li>$alteration</li>\n";
+ }
echo "</ol>\n";
}
@@ -2570,73 +2929,83 @@
* @param string $template The directory name of the theme.
* @return bool
*/
-function make_site_theme_from_oldschool($theme_name, $template) {
+function make_site_theme_from_oldschool( $theme_name, $template ) {
$home_path = get_home_path();
- $site_dir = WP_CONTENT_DIR . "/themes/$template";
-
- if (! file_exists("$home_path/index.php"))
+ $site_dir = WP_CONTENT_DIR . "/themes/$template";
+
+ if ( ! file_exists( "$home_path/index.php" ) ) {
return false;
+ }
/*
* Copy files from the old locations to the site theme.
* TODO: This does not copy arbitrary include dependencies. Only the standard WP files are copied.
*/
- $files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php');
-
- foreach ($files as $oldfile => $newfile) {
- if ($oldfile == 'index.php')
+ $files = array(
+ 'index.php' => 'index.php',
+ 'wp-layout.css' => 'style.css',
+ 'wp-comments.php' => 'comments.php',
+ 'wp-comments-popup.php' => 'comments-popup.php',
+ );
+
+ foreach ( $files as $oldfile => $newfile ) {
+ if ( $oldfile == 'index.php' ) {
$oldpath = $home_path;
- else
+ } else {
$oldpath = ABSPATH;
+ }
// Check to make sure it's not a new index.
- if ($oldfile == 'index.php') {
- $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 ( $oldfile == 'index.php' ) {
+ $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" ) ) {
return false;
+ }
// Don't copy anything.
continue;
}
}
- if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile"))
+ if ( ! @copy( "$oldpath/$oldfile", "$site_dir/$newfile" ) ) {
return false;
-
- chmod("$site_dir/$newfile", 0777);
+ }
+
+ chmod( "$site_dir/$newfile", 0777 );
// Update the blog header include in each file.
- $lines = explode("\n", implode('', file("$site_dir/$newfile")));
- if ($lines) {
- $f = fopen("$site_dir/$newfile", 'w');
-
- foreach ($lines as $line) {
- if (preg_match('/require.*wp-blog-header/', $line))
+ $lines = explode( "\n", implode( '', file( "$site_dir/$newfile" ) ) );
+ if ( $lines ) {
+ $f = fopen( "$site_dir/$newfile", 'w' );
+
+ foreach ( $lines as $line ) {
+ if ( preg_match( '/require.*wp-blog-header/', $line ) ) {
$line = '//' . $line;
+ }
// 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);
-
- fwrite($f, "{$line}\n");
+ $line = str_replace( "<?php include(ABSPATH . 'wp-comments.php'); ?>", '<?php comments_template(); ?>', $line );
+
+ fwrite( $f, "{$line}\n" );
}
- fclose($f);
+ fclose( $f );
}
}
// 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";
-
- $stylelines = file_get_contents("$site_dir/style.css");
- if ($stylelines) {
- $f = fopen("$site_dir/style.css", 'w');
-
- fwrite($f, $header);
- fwrite($f, $stylelines);
- fclose($f);
+ $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";
+
+ $stylelines = file_get_contents( "$site_dir/style.css" );
+ if ( $stylelines ) {
+ $f = fopen( "$site_dir/style.css", 'w' );
+
+ fwrite( $f, $header );
+ fwrite( $f, $stylelines );
+ fclose( $f );
}
return true;
@@ -2653,58 +3022,68 @@
* @param string $template The directory name of the theme.
* @return false|void
*/
-function make_site_theme_from_default($theme_name, $template) {
- $site_dir = WP_CONTENT_DIR . "/themes/$template";
+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');
- $theme_dir = @ opendir($default_dir);
- if ($theme_dir) {
- while(($theme_file = readdir( $theme_dir )) !== false) {
- if (is_dir("$default_dir/$theme_file"))
+ $theme_dir = @ opendir( $default_dir );
+ if ( $theme_dir ) {
+ while ( ( $theme_file = readdir( $theme_dir ) ) !== false ) {
+ if ( is_dir( "$default_dir/$theme_file" ) ) {
continue;
- if (! @copy("$default_dir/$theme_file", "$site_dir/$theme_file"))
+ }
+ if ( ! @copy( "$default_dir/$theme_file", "$site_dir/$theme_file" ) ) {
return;
- chmod("$site_dir/$theme_file", 0777);
+ }
+ chmod( "$site_dir/$theme_file", 0777 );
}
}
- @closedir($theme_dir);
+ @closedir( $theme_dir );
// Rewrite the theme header.
- $stylelines = explode("\n", implode('', file("$site_dir/style.css")));
- if ($stylelines) {
- $f = fopen("$site_dir/style.css", 'w');
-
- 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';
- fwrite($f, $line . "\n");
+ $stylelines = explode( "\n", implode( '', file( "$site_dir/style.css" ) ) );
+ if ( $stylelines ) {
+ $f = fopen( "$site_dir/style.css", 'w' );
+
+ 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';
+ }
+ fwrite( $f, $line . "\n" );
}
- fclose($f);
+ fclose( $f );
}
// Copy the images.
- umask(0);
- if (! mkdir("$site_dir/images", 0777)) {
+ umask( 0 );
+ if ( ! mkdir( "$site_dir/images", 0777 ) ) {
return false;
}
- $images_dir = @ opendir("$default_dir/images");
- if ($images_dir) {
- while(($image = readdir($images_dir)) !== false) {
- if (is_dir("$default_dir/images/$image"))
+ $images_dir = @ opendir( "$default_dir/images" );
+ if ( $images_dir ) {
+ while ( ( $image = readdir( $images_dir ) ) !== false ) {
+ if ( is_dir( "$default_dir/images/$image" ) ) {
continue;
- if (! @copy("$default_dir/images/$image", "$site_dir/images/$image"))
+ }
+ if ( ! @copy( "$default_dir/images/$image", "$site_dir/images/$image" ) ) {
return;
- chmod("$site_dir/images/$image", 0777);
+ }
+ chmod( "$site_dir/images/$image", 0777 );
}
}
- @closedir($images_dir);
+ @closedir( $images_dir );
}
/**
@@ -2718,41 +3097,42 @@
*/
function make_site_theme() {
// Name the theme after the blog.
- $theme_name = __get_option('blogname');
- $template = sanitize_title($theme_name);
- $site_dir = WP_CONTENT_DIR . "/themes/$template";
+ $theme_name = __get_option( 'blogname' );
+ $template = sanitize_title( $theme_name );
+ $site_dir = WP_CONTENT_DIR . "/themes/$template";
// If the theme already exists, nothing to do.
- if ( is_dir($site_dir)) {
+ if ( is_dir( $site_dir ) ) {
return false;
}
// We must be able to write to the themes dir.
- if (! is_writable(WP_CONTENT_DIR . "/themes")) {
+ if ( ! is_writable( WP_CONTENT_DIR . '/themes' ) ) {
return false;
}
- umask(0);
- if (! mkdir($site_dir, 0777)) {
+ umask( 0 );
+ if ( ! mkdir( $site_dir, 0777 ) ) {
return false;
}
- if (file_exists(ABSPATH . 'wp-layout.css')) {
- if (! make_site_theme_from_oldschool($theme_name, $template)) {
+ if ( file_exists( ABSPATH . 'wp-layout.css' ) ) {
+ if ( ! make_site_theme_from_oldschool( $theme_name, $template ) ) {
// TODO: rm -rf the site theme directory.
return false;
}
} else {
- if (! make_site_theme_from_default($theme_name, $template))
+ if ( ! make_site_theme_from_default( $theme_name, $template ) ) {
// TODO: rm -rf the site theme directory.
return false;
+ }
}
// Make the new site theme active.
- $current_template = __get_option('template');
- if ($current_template == WP_DEFAULT_THEME) {
- update_option('template', $template);
- update_option('stylesheet', $template);
+ $current_template = __get_option( 'template' );
+ if ( $current_template == WP_DEFAULT_THEME ) {
+ update_option( 'template', $template );
+ update_option( 'stylesheet', $template );
}
return $template;
}
@@ -2765,24 +3145,24 @@
* @param int $level User level.
* @return string User role name.
*/
-function translate_level_to_role($level) {
- switch ($level) {
- case 10:
- case 9:
- case 8:
- return 'administrator';
- case 7:
- case 6:
- case 5:
- return 'editor';
- case 4:
- case 3:
- case 2:
- return 'author';
- case 1:
- return 'contributor';
- case 0:
- return 'subscriber';
+function translate_level_to_role( $level ) {
+ switch ( $level ) {
+ case 10:
+ case 9:
+ case 8:
+ return 'administrator';
+ case 7:
+ case 6:
+ case 5:
+ return 'editor';
+ case 4:
+ case 3:
+ case 2:
+ return 'author';
+ case 1:
+ return 'contributor';
+ case 0:
+ return 'subscriber';
}
}
@@ -2796,8 +3176,9 @@
function wp_check_mysql_version() {
global $wpdb;
$result = $wpdb->check_database_version();
- if ( is_wp_error( $result ) )
- die( $result->get_error_message() );
+ if ( is_wp_error( $result ) ) {
+ wp_die( $result );
+ }
}
/**
@@ -2828,8 +3209,9 @@
function maybe_disable_link_manager() {
global $wp_current_db_version, $wpdb;
- if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
+ if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) ) {
update_option( 'link_manager_enabled', 0 );
+ }
}
/**
@@ -2846,13 +3228,13 @@
// Upgrade versions prior to 2.9
if ( $wp_current_db_version < 11557 ) {
// Delete duplicate options. Keep the option with the highest option_id.
- $wpdb->query("DELETE o1 FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 USING (`option_name`) WHERE o2.option_id > o1.option_id");
+ $wpdb->query( "DELETE o1 FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 USING (`option_name`) WHERE o2.option_id > o1.option_id" );
// Drop the old primary key and add the new.
- $wpdb->query("ALTER TABLE $wpdb->options DROP PRIMARY KEY, ADD PRIMARY KEY(option_id)");
+ $wpdb->query( "ALTER TABLE $wpdb->options DROP PRIMARY KEY, ADD PRIMARY KEY(option_id)" );
// Drop the old option_name index. dbDelta() doesn't do the drop.
- $wpdb->query("ALTER TABLE $wpdb->options DROP INDEX option_name");
+ $wpdb->query( "ALTER TABLE $wpdb->options DROP INDEX option_name" );
}
// Multisite schema upgrades.
@@ -2894,18 +3276,18 @@
}
}
-if ( !function_exists( 'install_global_terms' ) ) :
-/**
- * Install global terms.
- *
- * @since 3.0.0
- *
- * @global wpdb $wpdb
- * @global string $charset_collate
- */
-function install_global_terms() {
- global $wpdb, $charset_collate;
- $ms_queries = "
+if ( ! function_exists( 'install_global_terms' ) ) :
+ /**
+ * Install global terms.
+ *
+ * @since 3.0.0
+ *
+ * @global wpdb $wpdb
+ * @global string $charset_collate
+ */
+ function install_global_terms() {
+ global $wpdb, $charset_collate;
+ $ms_queries = "
CREATE TABLE $wpdb->sitecategories (
cat_ID bigint(20) NOT NULL auto_increment,
cat_name varchar(55) NOT NULL default '',
@@ -2916,9 +3298,9 @@
KEY last_updated (last_updated)
) $charset_collate;
";
-// now create tables
- dbDelta( $ms_queries );
-}
+ // now create tables
+ dbDelta( $ms_queries );
+ }
endif;
/**