Changeset 43654 for trunk/src/wp-admin/includes/ms.php

Timestamp:

09/24/2018 03:08:32 PM (6 years ago)

Author:

flixos90

Message:

Multisite: Introduce a site initialization and uninitialization API.

This changeset makes the new CRUD API for sites introduced in [43548] usable for real-world sites. A new function wp_initialize_site(), which takes care of creating a site's database tables and populating them with initial values, is hooked into the site insertion process that is initiated when calling wp_insert_site(). Similarly, a new function wp_uninitialize_site(), which takes care of dropping a site's database tables, is hooked into the site deletion process that is initiated when calling wp_delete_site().

A new function wp_is_site_initialized() completes the API, allowing to check whether a site is initialized. Since this function always makes a database request in its default behavior, it should be called with caution. Plugins that would like to use site initialization in special ways can leverage a pre_wp_is_site_initialized filter to alter that default behavior.

The separate handling of the site's row in the wp_blogs database table and the actual site setup allows for more flexibility in controlling whether or how a site's data is set up. For example, a unit test that only checks data from the site's database table row can unhook the site initialization process to improve performance. At the same time, developers consuming the new sites API only need to know about the CRUD functions, since the initialization and uninitialization processes happen internally.

With this changeset, the foundation for a sites REST API endpoint is fully available. The previously recommended functions wpmu_create_blog() and wpmu_delete_blog() now call the new respective function internally. Further follow-up work to this includes replacing calls to wpmu_create_blog() with wp_insert_site(), update_blog_details() with wp_update_site() and wpmu_delete_blog() with wp_delete_blog() throughout the codebase.

As a side-effect of this work, the wpmu_new_blog, delete_blog, and deleted_blog actions and the install_blog() function have been deprecated.

Fixes #41333. See #40364.

File:

• trunk/src/wp-admin/includes/ms.php (modified) (2 diffs)

trunk/src/wp-admin/includes/ms.php

@@ -74 +74 @@
 
     $blog = get_site( $blog_id );
-    /**
-     * Fires before a site is deleted.
-     *
-     * @since MU (3.0.0)
-     *
-     * @param int  $blog_id The site ID.
-     * @param bool $drop    True if site's table should be dropped. Default is false.
-     */
-    do_action( 'delete_blog', $blog_id, $drop );
-
-    $users = get_users(
-        array(
-            'blog_id' => $blog_id,
-            'fields'  => 'ids',
-        )
-    );
-
-    // Remove users from this blog.
-    if ( ! empty( $users ) ) {
-        foreach ( $users as $user_id ) {
-            remove_user_from_blog( $user_id, $blog_id );
-        }
-    }
-
-    update_blog_status( $blog_id, 'deleted', 1 );
 
     $current_network = get_network();
@@ -120 +95 @@
 
     if ( $drop ) {
-        $uploads = wp_get_upload_dir();
-
-        $tables = $wpdb->tables( 'blog' );
-        /**
-         * Filters the tables to drop when the site is deleted.
-         *
-         * @since MU (3.0.0)
-         *
-         * @param string[] $tables  Array of names of the site tables to be dropped.
-         * @param int      $blog_id The ID of the site to drop tables for.
-         */
-        $drop_tables = apply_filters( 'wpmu_drop_tables', $tables, $blog_id );
-
-        foreach ( (array) $drop_tables as $table ) {
-            $wpdb->query( "DROP TABLE IF EXISTS `$table`" );
-        }
-
-        if ( is_site_meta_supported() ) {
-            $blog_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->blogmeta WHERE blog_id = %d ", $blog_id ) );
-            foreach ( $blog_meta_ids as $mid ) {
-                delete_metadata_by_mid( 'blog', $mid );
+        wp_delete_site( $blog_id );
+    } else {
+        /** This action is documented in wp-includes/ms-blogs.php */
+        do_action_deprecated( 'delete_blog', array( $blog_id, false ), '5.0.0' );
+
+        $users = get_users(
+            array(
+                'blog_id' => $blog_id,
+                'fields'  => 'ids',
+            )
+        );
+
+        // Remove users from this blog.
+        if ( ! empty( $users ) ) {
+            foreach ( $users as $user_id ) {
+                remove_user_from_blog( $user_id, $blog_id );
             }
         }
 
-        wp_delete_site( $blog_id );
-
-        /**
-         * Filters the upload base directory to delete when the site is deleted.
-         *
-         * @since MU (3.0.0)
-         *
-         * @param string $uploads['basedir'] Uploads path without subdirectory. @see wp_upload_dir()
-         * @param int    $blog_id            The site ID.
-         */
-        $dir     = apply_filters( 'wpmu_delete_blog_upload_dir', $uploads['basedir'], $blog_id );
-        $dir     = rtrim( $dir, DIRECTORY_SEPARATOR );
-        $top_dir = $dir;
-        $stack   = array( $dir );
-        $index   = 0;
-
-        while ( $index < count( $stack ) ) {
-            // Get indexed directory from stack
-            $dir = $stack[ $index ];
-
-            $dh = @opendir( $dir );
-            if ( $dh ) {
-                while ( ( $file = @readdir( $dh ) ) !== false ) {
-                    if ( $file == '.' || $file == '..' ) {
-                        continue;
-                    }
-
-                    if ( @is_dir( $dir . DIRECTORY_SEPARATOR . $file ) ) {
-                        $stack[] = $dir . DIRECTORY_SEPARATOR . $file;
-                    } elseif ( @is_file( $dir . DIRECTORY_SEPARATOR . $file ) ) {
-                        @unlink( $dir . DIRECTORY_SEPARATOR . $file );
-                    }
-                }
-                @closedir( $dh );
-            }
-            $index++;
-        }
-
-        $stack = array_reverse( $stack ); // Last added dirs are deepest
-        foreach ( (array) $stack as $dir ) {
-            if ( $dir != $top_dir ) {
-                @rmdir( $dir );
-            }
-        }
-
-        clean_blog_cache( $blog );
-    }
-
-    /**
-     * Fires after the site is deleted from the network.
-     *
-     * @since 4.8.0
-     *
-     * @param int  $blog_id The site ID.
-     * @param bool $drop    True if site's tables should be dropped. Default is false.
-     */
-    do_action( 'deleted_blog', $blog_id, $drop );
+        update_blog_status( $blog_id, 'deleted', 1 );
+
+        /** This action is documented in wp-includes/ms-blogs.php */
+        do_action_deprecated( 'deleted_blog', array( $blog_id, false ), '5.0.0' );
+    }
 
     if ( $switch ) {