Changeset 2864100

Timestamp:

02/13/2023 02:01:35 AM (3 years ago)

Author:

manfcarlo

Message:

v1.2.0

Location:

wp-super-network

Files:

• tags/1.2.0 (copied) (copied from wp-super-network/trunk)
• tags/1.2.0/assets (added)
• tags/1.2.0/assets/js (added)
• tags/1.2.0/assets/js/post-new.js (added)
• tags/1.2.0/init.php (modified) (1 diff)
• tags/1.2.0/readme.txt (modified) (5 diffs)
• tags/1.2.0/src/blog.php (modified) (1 diff)
• tags/1.2.0/src/expression.php (added)
• tags/1.2.0/src/insert.php (added)
• tags/1.2.0/src/network.php (modified) (18 diffs)
• tags/1.2.0/src/node.php (added)
• tags/1.2.0/src/plugin.php (modified) (5 diffs)
• tags/1.2.0/src/query.php (added)
• tags/1.2.0/src/subquery.php (added)
• tags/1.2.0/src/table.php (added)
• tags/1.2.0/wp-super-network.php (modified) (1 diff)
• trunk/assets (added)
• trunk/assets/js (added)
• trunk/assets/js/post-new.js (added)
• trunk/init.php (modified) (1 diff)
• trunk/readme.txt (modified) (5 diffs)
• trunk/src/blog.php (modified) (1 diff)
• trunk/src/expression.php (added)
• trunk/src/insert.php (added)
• trunk/src/network.php (modified) (18 diffs)
• trunk/src/node.php (added)
• trunk/src/plugin.php (modified) (5 diffs)
• trunk/src/query.php (added)
• trunk/src/subquery.php (added)
• trunk/src/table.php (added)
• trunk/wp-super-network.php (modified) (1 diff)

wp-super-network/tags/1.2.0/init.php

@@ -24 +24 @@
 require_once SUPER_NETWORK_DIR . 'vendor/autoload.php';
 
+// Load superclasses.
+require_once SUPER_NETWORK_DIR . 'src/node.php';
+
 // Load classes.
 require_once SUPER_NETWORK_DIR . 'src/blog.php';
+require_once SUPER_NETWORK_DIR . 'src/expression.php';
 require_once SUPER_NETWORK_DIR . 'src/field.php';
+require_once SUPER_NETWORK_DIR . 'src/insert.php';
 require_once SUPER_NETWORK_DIR . 'src/network.php';
 require_once SUPER_NETWORK_DIR . 'src/page.php';
 require_once SUPER_NETWORK_DIR . 'src/plugin.php';
+require_once SUPER_NETWORK_DIR . 'src/query.php';
 require_once SUPER_NETWORK_DIR . 'src/section.php';
+require_once SUPER_NETWORK_DIR . 'src/subquery.php';
+require_once SUPER_NETWORK_DIR . 'src/table.php';
 
 // Initialize the plugin.

wp-super-network/tags/1.2.0/readme.txt

@@ -2 +2 @@
 Contributors: manfcarlo
 Tags: network, multisite, share, sharing, move, migrate, migration, duplicate, syndication, content, management
-Tested up to: 5.9
-Stable tag: 1.1.0
+Tested up to: 6.1
+Stable tag: 1.2.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -40 +40 @@
 = How do I republish a page to the whole network? =
 
-As of version 1.0.5, you could flag any post or page on a main site for republication by finding it on the Posts or Pages screen and clicking Republish, but it would not take any effect. Version 1.1.0 now implements the behaviour of this feature!
+Flag any post or page on a main site for republication by finding it on the Posts or Pages screen and clicking Republish.
 
 After you have republished the post or page, it will start showing up across every site on your network. You can also access the network admin and click on Super Network. You will see a list of all posts and pages across all sites in the network that have been flagged for republication.
@@ -52 +52 @@
 = How do I turn an existing site into the main site for a new network? =
 
-This feature is still to come.
+This feature is scheduled for the next major release.
 
 = How do I manage all of my sites in a single admin area? =
@@ -62 +62 @@
 If two or more sites on a network have a post with the same numeric ID, none of these posts is able to be accessed on consolidated mode. You can eliminate post ID collisions by deleting posts you don't want via the network admin screen > Super Network.
 
-= Why are republished posts and pages not editable in the admin area? =
+= Is this the same as Global Terms? =
 
-This feature is still to come.
+No!
+
+WP Super Network does not enable any "global" data relationships. The data you can create with WP Super Network is the same as the data you can create without it. WP Super Network merely brings the management and the viewing of the data together into the one place.
+
+= Is this the same as WP Multi Network? =
+
+No!
+
+WP Super Network is compatible with multi-network environments, but it does not include the management tools that WP Multi Network includes. Therefore, the two plugins have different purposes and can work well together.
+
+= Is this the same as Distributor? =
+
+No!
+
+WP Super Network does not duplicate content between sites, and all posts will always continue to have one and only one permalink. Posts from across the network may preview in archives, but their permalinks will always direct back to their original respective sites.
+
+= Is this the same as MainWP? =
+
+Only a little bit.
+
+WP Super Network and MainWP share a few similar features. However, MainWP is only a good fit for users who don't use the block editor and don't use multisite, since MainWP is yet to announce any support for the block editor and MainWP's own documentation states that it does not test or support multisite. This is despite the block editor and multisite both being core WordPress features for a significant number of years.
+
+Also, MainWP's features do not integrate with the core WordPress interface and can only be accessed through its own specially-built interface.
+
+Although WP Super Network requires multisite, it does not require you to learn a new interface. Instead, you can continue working with the core WordPress interfaces you are already familiar with, including both the block editor and classic editor.
+
+= Which plugins are incompatible with WP Super Network? =
+
+WP Super Network is incompatible with [Link Manager](https://wordpress.org/plugins/link-manager/). Users of Link Manager will not be supported and are advised to not install WP Super Network.
+
+WP Super Network is currently incompatible with [SQLite Database Integration](https://wordpress.org/plugins/sqlite-database-integration/). Users of SQLite Database Integration are advised to not install WP Super Network for the time being. Compatibility is planned for a later release, so check back later.
+
+If you use a plugin that adds a db.php drop-in, it may or may not be incompatible with WP Super Network. To know if you have a db.php drop-in, go to the Plugins screen, click on Drop-in and check if db.php is listed. If the db.php drop-in was added by a plugin that follows the WordPress conventions well and has high user ratings, you are unlikely to see any incompatibility issues with WP Super Network, but you are welcome to ask on the support forum.
+
+= Is WP Super Network safe to install? =
+
+See above question about incompatible plugins.
+
+For best results, the free version of WP Super Network should be activated on a fresh network. While results will vary, you may find that some features (e.g. consolidated mode) are limited in utility for existing networks and/or cause a slow-down in performance for large networks.
+
+None the less, the utmost care has been taken to avoid permanent data loss or corruption. Keeping regular database back-ups is always recommended, but deactivating the plugin should return your network back to its previous state.
+
+A premium version is planned for the future, focusing on enhanced performance for medium-to-large networks.
 
 = How do I suggest a new feature or submit a bug report? =
@@ -71 +113 @@
 
 == Changelog ==
+
+= 1.2.0 =
+* Republished posts and pages can be inserted, updated and deleted
+* Availability of taxonomies and comments for republished posts
+* Changed behaviour of select queries that target a specific post
+* Cache implemented for duplicate queries
+* Fixed a few bugs with network-based options
+* Minimum PHP version lifted to 7.2
 
 = 1.1.0 =

wp-super-network/tags/1.2.0/src/blog.php

@@ -38 +38 @@
             return $this->wp_site->site_id;
         }
+
+        if ( $key === 'name' )
+        {
+            return $this->wp_site->blogname;
+        }
     }
     

wp-super-network/tags/1.2.0/src/network.php

@@ -7 +7 @@
 class Network
 {
-    const ID_COLS = array(
-        'comments' => 'comment_post_ID',
-        'postmeta' => 'post_id',
-        'posts' => 'ID',
-        'term_relationships' => 'object_id'
-    );
-
     /**
      * Supernetwork
@@ -54 +47 @@
     private $page;
 
-    private $parser;
-    private $creator;
-
-    private $collisions = array();
+    /**
+     * Keeps track of ID collisions.
+     *
+     * @since 1.2.0
+     * @var array
+     */
+    private $collisions = WP_Super_Network::ENTITIES_TO_REPLACE;
+
+    /**
+     * Cache that maps ID's to blogs.
+     *
+     * @since 1.2.0
+     * @var array
+     */
+    private $blog_cache = WP_Super_Network::ENTITIES_TO_REPLACE;
+
     private $republished = array();
     private $post_types = array();
 
+    private $meta_ids = array();
+
     public function shared_auto_increment( $post_ID, $post, $update )
     {
@@ -69 +76 @@
     }
 
-    private function set_auto_increment( $new )
+    public function auto_increment_comments( $id, $comment )
+    {
+        if ( $this->consolidated || in_array( (string) $comment->comment_post_ID, $this->republished, true ) )
+        {
+            $this->set_auto_increment( $id + 1, 'comments' );
+        }
+    }
+
+    public function auto_increment_terms( $term_id, $tt_id, $taxonomy, $args )
+    {
+        if ( $this->consolidated )
+        {
+            $this->set_auto_increment( $tt_id + 1, 'term_taxonomy' );
+            $this->set_auto_increment( $term_id + 1, 'terms' );
+        }
+    }
+
+    public function auto_increment_term_relationships( $object_id, $tt_id, $taxonomy )
+    {
+        if ( !$this->consolidated && in_array( (string) $object_id, $this->republished, true ) )
+        {
+            $this->set_auto_increment( $tt_id + 1, 'term_taxonomy' );
+            $term = get_term_by( 'term_taxonomy_id', $tt_id ) and $this->set_auto_increment( $term->term_id + 1, 'terms' );
+        }
+    }
+
+    private function set_auto_increment( $new, $entity = 'posts' )
     {
         foreach ( $this->blogs as $blog )
         {
-            if ( $new > (int) $GLOBALS['wpdb']->get_var( 'select auto_increment from information_schema.tables where table_schema = \'' . DB_NAME . '\' and table_name = \'' . $blog->table( 'posts' ) . '\'' ) )
-            {
-                $GLOBALS['wpdb']->query( 'alter table ' . $blog->table( 'posts' ) . ' auto_increment = ' . (string) $new );
+            if ( $new > (int) $GLOBALS['wpdb']->get_var( 'SELECT `auto_increment` FROM `information_schema`.`tables` WHERE `table_schema` = \'' . DB_NAME . '\' AND `table_name` = \'' . $blog->table( $entity ) . '\'' ) )
+            {
+                $GLOBALS['wpdb']->query( 'ALTER TABLE `' . $blog->table( $entity ) . '` AUTO_INCREMENT = ' . (string) $new );
             }
         }
@@ -96 +129 @@
             return $this->republished;
         }
-    }
-
-    public function __set( $key, $value )
-    {
-        if ( $key === 'consolidated' )
-        {
-            if ( $value === true )
-            {
-                $this->consolidated = true;
-            }
-            
-            if ( $value === false )
-            {
-                $this->consolidated = false;
-
-                if ( !empty( $this->republished ) )
-                {
-                    $this->set_auto_increment( $this->republished[0] + 1 );
-                }
-            }
-        }
-    }
-
-    private function union( $table )
-    {
-        if ( !$this->consolidated && empty( $this->republished ) )
+
+        if ( $key === 'post_types' )
+        {
+            return $this->post_types;
+        }
+    }
+
+    public function union( $table )
+    {
+        // No need to do anything if not consolidated and no republished posts.
+        if ( !$this->consolidated && ( empty( $this->republished ) || empty( $post_cols = array_keys( WP_Super_Network::TABLES_TO_REPLACE[ $table ], 'posts', true ) ) ) )
         {
             return $GLOBALS['wpdb']->__get( $table );
@@ -131 +149 @@
         {
             $where = array();
-
-            if ( $this->consolidated )
-            {
-                if ( !empty( $this->collisions ) )
-                {
-                    $where[] = self::ID_COLS[ $table ] . ' not in (' . implode( ', ', $this->collisions ) . ')';
-                }
-
-                if ( $table === 'posts' && !empty( $this->post_types ) && !$blog->is_network() )
-                {
-                    $where[] = 'post_type not in (\'' . implode( '\', \'', $this->post_types ) . '\')';
-                }
-            }
-            else
-            {
+            $this->exclude( $where, $table, $blog );
+
+            if ( !$this->consolidated )
+            {
+                // Add republished posts.
                 if ( $blog->table( $table ) !== $GLOBALS['wpdb']->__get( $table ) )
                 {
-                    $where[] = self::ID_COLS[ $table ] . ' in (' . implode( ', ', $this->republished ) . ')';
+                    foreach ( $post_cols as $col )
+                    {
+                        // Post parent is currently not being handled.
+                        $col === 'post_parent' or $where[] = '`' . $col . '` IN (' . implode( ', ', $this->republished ) . ')';
+                    }
                 }
             }
 
-            $tables[] = 'select * from ' . $blog->table( $table ) . ( empty( $where ) ? '' : ( ' where ' . implode( ' and ', $where ) ) );
-        }
-
-        return implode( ' union ', $tables );
+            $tables[] = 'SELECT * FROM `' . $blog->table( $table ) . ( empty( $where ) ? '`' : ( '` WHERE ' . implode( ' AND ', $where ) ) );
+        }
+
+        return implode( ' UNION ALL ', $tables );
+    }
+
+    public function exclude( &$where, $table, $blog, $alias = '' )
+    {
+        if ( $this->consolidated )
+        {
+            empty( $alias ) or $alias .= '.';
+
+            // Exclude any entities involved in collisions.
+            foreach ( array_keys( $this->collisions ) as $entity )
+            {
+                if ( !empty( $this->collisions[ $entity ] ) )
+                {
+                    foreach ( array_keys( WP_Super_Network::TABLES_TO_REPLACE[ $table ], $entity, true ) as $col )
+                    {
+                        $where[] = $alias . '`' . $col . '` NOT IN (' . implode( ', ', $this->collisions[ $entity ] ) . ')';
+                    }
+                }
+            }
+
+            // Exclude network-based post types.
+            if ( $table === 'posts' && !empty( $this->post_types ) && !$blog->is_network() )
+            {
+                $where[] = $alias . '`post_type` NOT IN (\'' . implode( '\', \'', $this->post_types ) . '\')';
+            }
+        }
     }
 
     public function report_collisions()
     {
-        if ( $this->consolidated && !empty( $this->collisions ) && current_user_can( 'manage_network_options' ) )
-        {
-            echo '<div class="notice notice-error"><p><strong>WP Super Network detected ' . count( $this->collisions ) . ' post ID collisions</strong> across your network! These posts have been temporarily hidden. To access them again, please turn off consolidated mode.</p></div>';
+        $term_collisions = count( $this->collisions['term_taxonomy'] ) + count( $this->collisions['terms'] );
+
+        if ( $this->consolidated && ( !empty( $this->collisions['posts'] ) || $term_collisions > 0 || !empty( $this->collisions['comments'] ) ) && current_user_can( 'manage_network_options' ) )
+        {
+            echo '<div class="notice notice-error"><p><strong>WP Super Network detected ';
+
+            echo empty( $this->collisions['posts'] ) ? '' : count( $this->collisions['posts'] ) . ' post ID collisions';
+
+            if ( !empty( $this->collisions['posts'] ) && $term_collisions > 0 )
+            {
+                echo empty( $this->collisions['comments'] ) ? ' and ' : ', ';
+            }
+
+            echo $term_collisions > 0 ? $term_collisions . ' taxonomy term ID collisions' : '';
+
+            if ( !empty( $this->collisions['comments'] ) )
+            {
+                echo ( !empty( $this->collisions['posts'] ) || $term_collisions > 0 ) ? ' and ' : '';
+                echo count( $this->collisions['comments'] ) . ' comment ID collisions';
+            }
+
+            echo '</strong> across your network! These entities have been temporarily hidden. To access them again, please turn off consolidated mode.</p></div>';
         }
     }
@@ -169 +226 @@
      * Constructor.
      *
-     * Constructs the network.
+     * Queries sent during this method do not get modified, as the filter is applied later.
      *
      * @since 1.0.4
@@ -179 +236 @@
         foreach ( get_sites( 'network_id=' . $network->id ) as $site )
         {
-            array_push( $this->blogs, new Blog( $site ) );
-        }
-
-        add_filter( 'admin_footer', array( $this, 'report_collisions' ) );
-
-        $this->parser = new \PHPSQLParser\PHPSQLParser();
-        $this->creator = new \PHPSQLParser\PHPSQLCreator();
-
-        $this->collisions = $GLOBALS['wpdb']->get_col( 'select ID from (' . $this->union( 'posts' ) . ') posts group by ID having count(*) > 1 order by ID asc' );
-        $this->republished = $GLOBALS['wpdb']->get_col( 'select post_id from (' . $this->union( 'postmeta' ) . ') postmeta where meta_key = \'_supernetwork_share\' order by post_id desc' );
-        $this->post_types = array_keys( (array) get_option( 'supernetwork_post_types' ) );
+            $this->blogs[ (int) $site->blog_id ] = new Blog( $site );
+        }
 
         $this->page = new Settings_Page(
@@ -209 +257 @@
 
         global $wpdb;
-        $results = $wpdb->get_results( "select distinct option_name from $wpdb->options where option_name not like '\_%' and option_name not like 'supernetwork\_%' order by option_name" );
+        $results = $wpdb->get_results( "SELECT DISTINCT `option_name` FROM $wpdb->options WHERE `option_name` NOT LIKE '\_%' AND `option_name` NOT LIKE 'supernetwork\_%' ORDER BY `option_name`" );
         $labels = array();
 
@@ -252 +300 @@
             'Consolidated Mode',
             'Turn on consolidated mode?',
-            '<strong>Warning:</strong> Consolidated mode is highly unstable. It is strongly suggested that you have a REGULAR backup regime in place for your database, before activating consolidated mode.'
+            '<strong>Warning:</strong> Consolidated mode is recommended for fresh networks. If you have pre-existing data (e.g. posts and pages) on your network, some of it may not be compatible with consolidated mode.'
         );
 
@@ -263 +311 @@
     }
 
+    public function add_new_post( $hook_suffix )
+    {
+        $post_type = empty( $_GET['post_type'] ) ? 'post' : $_GET['post_type'];
+
+        if ( $hook_suffix === 'edit.php' && $this->consolidated && !in_array( $post_type, $this->post_types, true ) )
+        {
+            wp_enqueue_script(
+                'supernetwork-post-new',
+                SUPER_NETWORK_URL . 'assets/js/post-new.js',
+                array(),
+                null,
+                true
+            );
+
+            $blogs = array();
+            $type = get_post_type_object( $post_type );
+            $edit = isset( $post_type ) ? $type->cap->edit_posts : 'do_not_allow';
+            $create = isset( $post_type ) ? $type->cap->create_posts : 'do_not_allow';
+
+            foreach ( $this->blogs as $blog )
+            {
+                $id = $blog->id;
+
+                if ( current_user_can_for_blog( $id, $edit ) && current_user_can_for_blog( $id, $create ) )
+                {
+                    $blogs[ $id ] = $blog->name;
+                }
+            }
+
+            wp_add_inline_script(
+                'supernetwork-post-new',
+                'var blogs = ' . json_encode( $blogs ) . '; var currentId = "' . get_current_blog_id() . '";',
+                'before'
+            );
+        }
+    }
+
     public function post_types( $args, $field )
     {
@@ -276 +361 @@
     }
 
-    public function register_pages()
+    private function push_meta_ids( $meta_ids, $object_id )
+    {
+        $this->meta_ids[] = array( $meta_ids, $object_id );
+    }
+
+    public function meta_ids()
+    {
+        return empty( $this->meta_ids ) ? array() : $this->meta_ids[ count( $this->meta_ids ) - 1 ][0];
+    }
+
+    public function meta_object_id()
+    {
+        return empty( $this->meta_ids ) ? 0 : $this->meta_ids[ count( $this->meta_ids ) - 1 ][1];
+    }
+
+    public function pop_meta_ids()
+    {
+        array_pop( $this->meta_ids );
+    }
+
+    public function delete_meta( $meta_ids, $object_id )
+    {
+        $this->push_meta_ids( $meta_ids, $object_id );
+        return $meta_ids;
+    }
+
+    public function register()
     {
         $this->page->register();
+
+        add_filter( 'post_type_link', array( $this, 'intercept_permalink_for_post' ), 10, 2 );
+        add_filter( 'post_link', array( $this, 'intercept_permalink_for_post' ), 10, 2 );
+        add_filter( 'page_link', array( $this, 'intercept_permalink' ), 10, 2 );
+        add_filter( 'preview_post_link', array( $this, 'intercept_preview_link' ), 10, 2 );
+        add_filter( 'supernetwork_preview_link', array( $this, 'replace_preview_link' ), 10, 2 );
+        add_filter( 'user_has_cap', array( $this, 'intercept_capability' ), 10, 4 );
+        add_filter( 'pre_handle_404', array( $this, 'singular_access' ), 10, 2 );
+        add_action( 'wp', array( $this, 'preview_access' ) );
+        add_filter( 'query', array( $this, 'intercept_query' ), 10, 2 );
+        add_filter( 'wp_insert_post', array( $this, 'shared_auto_increment' ), 10, 3 );
+        add_filter( 'wp_insert_comment', array( $this, 'auto_increment_comments' ), 10, 2 );
+        add_filter( 'created_term', array( $this, 'auto_increment_terms' ), 10, 4 );
+        add_filter( 'added_term_relationship', array( $this, 'auto_increment_term_relationships' ), 10, 3 );
+        add_filter( 'admin_enqueue_scripts', array( $this, 'add_new_post' ) );
+        add_filter( 'admin_footer', array( $this, 'report_collisions' ) );
+        add_filter( 'delete_comment_meta', array( $this, 'delete_meta' ), 10, 2 );
+        add_filter( 'delete_post_meta', array( $this, 'delete_meta' ), 10, 2 );
+        add_filter( 'delete_term_meta', array( $this, 'delete_meta' ), 10, 2 );
+
+        // Comments must be queried before posts so as not to mask any comment ID collisions.
+        // Taxonomy terms must be queried before terms so as not to mask any taxonomy term ID collisions.
+        foreach ( array_keys( $this->collisions ) as $entity )
+        {
+            // `ID` comes before `post_parent` in the `posts` sub-array, so `ID` will be correctly returned.
+            $id = array_search( $entity, WP_Super_Network::TABLES_TO_REPLACE[ $entity ], true );
+
+            $this->collisions[ $entity ] = $GLOBALS['wpdb']->get_col( 'SELECT `' . $id . '` FROM `' . $GLOBALS['wpdb']->__get( $entity ) . '` GROUP BY `' . $id . '` HAVING COUNT(*) > 1 ORDER BY `' . $id . '` ASC' );
+        }
+
+        $consolidated = !empty( get_option( 'supernetwork_consolidated', array() )['consolidated'] );
+
+        if ( $consolidated )
+        {
+            $this->post_types = array_keys( get_option( 'supernetwork_post_types', array() ) );
+        }
+        else
+        {
+            $extra_where = '';
+            $extra_where_2 = '';
+            $relationships = $GLOBALS['wpdb']->term_relationships;
+            $taxonomy = $GLOBALS['wpdb']->term_taxonomy;
+
+            // The `AND 1=1` is to avoid a bug in the SQL parser caused by consecutive brackets.
+            empty( $this->collisions['comments'] ) or $extra_where .= ' AND `post_id` NOT IN (SELECT `comment_post_ID` FROM `' . $GLOBALS['wpdb']->comments . '` WHERE `comment_ID` IN (' . implode( ', ', $this->collisions[ 'comments' ] ) . ') AND 1=1)';
+
+            if ( !empty( $this->collisions['term_taxonomy'] ) )
+            {
+                $extra_where .= ' AND `post_id` NOT IN (SELECT `object_id` FROM `' . $relationships . '` WHERE `term_taxonomy_id` IN (' . implode( ', ', $this->collisions[ 'term_taxonomy' ] ) . ') AND 1=1)';
+                $extra_where_2 = ' AND `' . $relationships . '`.`term_taxonomy_id` NOT IN (' . implode( ', ', $this->collisions[ 'term_taxonomy' ] ) . ')';
+            }
+
+            empty( $this->collisions['terms'] ) or $extra_where .= ' AND `post_id` NOT IN (SELECT `object_id` FROM `' . $relationships . '` LEFT JOIN `' . $taxonomy . '` ON `' . $relationships . '`.`term_taxonomy_id` = `' . $taxonomy . '`.`term_taxonomy_id` WHERE `term_id` IN (' . implode( ', ', $this->collisions[ 'terms' ] ) . ')' . $extra_where_2 . ' AND 1=1)';
+
+            // This query requires post collisions, but not the other collisions, to be recorded.
+            $old_comment_collisions = $this->collisions['comments'];
+            $old_taxonomy_term_collisions = $this->collisions['term_taxonomy'];
+            $old_term_collisions = $this->collisions['terms'];
+
+            foreach ( array( 'comments', 'term_taxonomy', 'terms' ) as $entity ) $this->collisions[ $entity ] = array();
+
+            $this->republished = $GLOBALS['wpdb']->get_col( 'SELECT DISTINCT `post_id` FROM `' . $GLOBALS['wpdb']->postmeta . '` WHERE `meta_key` = \'_supernetwork_share\'' . $extra_where . ' ORDER BY `post_id` DESC' );
+
+            $this->collisions['comments'] = $old_comment_collisions;
+            $this->collisions['term_taxonomy'] = $old_taxonomy_term_collisions;
+            $this->collisions['terms'] = $old_term_collisions;
+        }
+
+        $this->consolidated = $consolidated;
+
+        if ( !$this->consolidated && !empty( $this->republished ) )
+        {
+            $this->set_auto_increment( $this->republished[0] + 1 );
+        }
+    }
+
+    /**
+     * Selects an entity type to be first in line for collision elimination, based on a calculated score.
+     *
+     * The score for each entity type is the median ID of its collisions, divided by the median ID overall.
+     * A score of 1 means the collisions are evenly distributed.
+     * A lower score means the collisions are concentrated on the lower ID's, which are more likely to be older entities with more references and importance.
+     *
+     * The entity type with the lowest score is selected for collision elimination.
+     *
+     * @since 1.2.0
+     */
+    private function get_entity_by_median_score()
+    {
+        // Temporarily empty collisions.
+        $old = $this->collisions;
+        $this->collisions = WP_Super_Network::ENTITIES_TO_REPLACE;
+        $scores = WP_Super_Network::ENTITIES_TO_REPLACE;
+
+        foreach ( $scores as $entity => &$score )
+        {
+            // `ID` comes before `post_parent` in the `posts` sub-array, so `ID` will be correctly returned.
+            $id = array_search( $entity, WP_Super_Network::TABLES_TO_REPLACE[ $entity ], true );
+
+            $collisions = $GLOBALS['wpdb']->get_col( 'SELECT `' . $id . '` FROM `' . $GLOBALS['wpdb']->__get( $entity ) . '` WHERE `' . $id . '` IN (SELECT `' . $id . '` FROM `' . $GLOBALS['wpdb']->__get( $entity ) . '` GROUP BY `' . $id . '` HAVING COUNT(*) > 1) ORDER BY `' . $id . '` ASC' );
+            $all = $GLOBALS['wpdb']->get_col( 'SELECT `' . $id . '` FROM `' . $GLOBALS['wpdb']->__get( $entity ) . '` ORDER BY `' . $id . '` ASC' );
+
+            $score = empty( $collisions ) ? PHP_FLOAT_MAX : $collisions[ floor( count( $collisions ) / 2 ) ] / $all[ floor( count( $all ) / 2 ) ];
+        }
+
+        $this->collisions = $old;
+        return array_search( min( $scores ), $scores );
+    }
+
+    /**
+     * Force deletes a term from a taxonomy.
+     *
+     * @since 1.2.0
+     */
+    private function force_delete_taxonomy_term( $term_id, $taxonomy )
+    {
+        // Temporarily register taxonomy to force deletion.
+        if ( !( $exists = taxonomy_exists( $taxonomy ) ) ) register_taxonomy( $taxonomy, array() );
+
+        // 0 is returned if the default term was not deleted.
+        $success = 0 !== wp_delete_term( $term_id, $taxonomy );
+
+        if ( !$exists ) unregister_taxonomy( $taxonomy );
+        return $success;
     }
 
@@ -288 +523 @@
         if ( $this->consolidated )
         {
-            echo '<h2>Post ID Collisions</h2>';
-
-            if ( !empty( $this->collisions ) && isset( $_POST['supernetwork_post_collision_' . $this->collisions[0] ] ) )
-            {
-                $this->consolidated = false;
-
-                foreach ( $this->blogs as $blog )
+        $entity = $this->get_entity_by_median_score();
+
+        $this->consolidated = false;
+
+            echo '<h2>ID Collisions</h2>';
+
+        if ( !empty( $this->collisions[ $entity ] ) && isset( $_POST[ 'supernetwork_' . $entity . '_collision_' . $this->collisions[ $entity ][0] ] ) )
+        {
+            $success = true;
+
+            foreach ( $this->blogs as $blog )
+            {
+                if ( $blog->id !== (int) explode( '_', $_POST[ 'supernetwork_' . $entity . '_collision_' . $this->collisions[ $entity ][0] ] )[0] )
                 {
                     switch_to_blog( $blog->id );
-                    
-                    if ( empty( $GLOBALS['wpdb']->get_col( 'select ID from ' . $blog->table( 'posts' ) . ' where guid = \'' . $_POST['supernetwork_post_collision_' . $this->collisions[0] ] . '\' limit 1' ) ) )
+
+                    if ( $entity === 'comments' ) wp_delete_comment( (int) $this->collisions['comments'][0], true );
+                    if ( $entity === 'posts' ) wp_delete_post( (int) $this->collisions['posts'][0], true );
+
+                    if ( $entity === 'term_taxonomy' )
                     {
-                        wp_delete_post( (int) $this->collisions[0], true );
+                        $term = $GLOBALS['wpdb']->get_row( 'SELECT `taxonomy`, `term_id` FROM `' . $GLOBALS['wpdb']->term_taxonomy . '` WHERE `term_taxonomy_id` = ' . $this->collisions['term_taxonomy'][0], ARRAY_A );
+
+                        if ( isset( $term['term_id'] ) && isset( $term['taxonomy'] ) )
+                        {
+                            $success = $this->force_delete_taxonomy_term( (int) $term['term_id'], $term['taxonomy'] ) && $success;
+                        }
+                    }
+
+                    if ( $entity === 'terms' )
+                    {
+                        $results = $GLOBALS['wpdb']->get_results( 'SELECT `taxonomy`, `term_id` FROM `' . $GLOBALS['wpdb']->term_taxonomy . '` WHERE `term_id` = ' . $this->collisions['terms'][0] );
+
+                        foreach ( $results as $result )
+                        {
+                            $success = $this->force_delete_taxonomy_term( (int) $result['term_id'], $result['taxonomy'] ) && $success;
+                        }
                     }
 
                     restore_current_blog();
                 }
-
+            }
+
+            // Start again if collision was eliminated.
+            if ( $success )
+            {
+                array_shift( $this->collisions[ $entity ] );
                 $this->consolidated = true;
-                array_shift( $this->collisions );
-            }
-
-            if ( empty( $this->collisions ) )
-            {
-                echo '<p>No collisions on this network!</p>';
-            }
-            else
-            {
-                $old_collisions = $this->collisions;
-                $old_post_types = $this->post_types;
-
-                $this->collisions = array();
-                $this->post_types = array();
-
-                echo '<p>Consolidated mode is designed for fresh networks. When activated on an existing network, a large number of ID collisions are inevitable. However, you may be able to eliminate some collisions when the ID refers to a post of low importance, such as a revision or autosave.</p>';
-                echo '<p>The below table allows you to eliminate post ID collisions, one ID at a time. For each ID, you must select just ONE post to keep. All others with the same ID will be immediately and irretrievably deleted.</p>';
-
-                echo '<form method="post" action="">';
-                echo '<table class="widefat">';
-                echo '<thead><tr><th scope="col">Keep?</th><th scope="col">GUID</th><th scope="col">Post Title</th><th scope="col">Post Preview</th><th scope="col">Post Type</th><th scope="col">Post Status</th></tr></thead>';
-                echo '<tbody>';
-
-                foreach ( $GLOBALS['wpdb']->get_results( 'select guid, post_title, substring(post_content, 1, 500) as post_preview, post_type, post_status from ' . $GLOBALS['wpdb']->posts . ' where ID = ' . $old_collisions[0], ARRAY_A ) as $site )
+                $entity = $this->get_entity_by_median_score();
+                $this->consolidated = false;
+            }
+        }
+
+        if ( empty( $this->collisions[ $entity ] ) )
+        {
+            echo '<p>No collisions on this network!</p>';
+        }
+        else
+        {
+            // `ID` comes before `post_parent` in the `posts` sub-array, so `ID` will be correctly returned.
+            $id = array_search( $entity, WP_Super_Network::TABLES_TO_REPLACE[ $entity ], true );
+            $id = 'terms' === $entity ? 't.' . $id : $id;
+
+            $fields = array(
+                'comments' => array(
+                    'post_title',
+                    'comment_content',
+                    'comment_author',
+                    'comment_author_email'
+                ),
+                'posts' => array(
+                    'post_title',
+                    'post_content',
+                    'post_type',
+                    'post_status'
+                ),
+                'term_taxonomy' => array(
+                    'name',
+                    'description',
+                    'taxonomy',
+                    'count'
+                ),
+                'terms' => array(
+                    'name',
+                    'description',
+                    'taxonomy',
+                    'count'
+                )
+            );
+
+            $labels = array(
+                'comments' => array(
+                    'Site Containing Post/Comment',
+                    'Post Containing Comment',
+                    'Comment Preview',
+                    'Comment Author',
+                    'Comment Author Email'
+                ),
+                'posts' => array(
+                    'Site Containing Post',
+                    'Post Title',
+                    'Post Preview',
+                    'Post Type',
+                    'Post Status'
+                ),
+                'term_taxonomy' => array(
+                    'Site Containing Taxonomy Term',
+                    'Taxonomy Term Name',
+                    'Taxonomy Term Description',
+                    'Taxonomy',
+                    'Post Count'
+                ),
+                'terms' => array(
+                    'Site Containing Taxonomy Term',
+                    'Taxonomy Term Name',
+                    'Taxonomy Term Description',
+                    'Taxonomy',
+                    'Post Count'
+                )
+            );
+
+            echo '<p>Consolidated mode is designed for fresh networks. When activated on an existing network, a large number of ID collisions are inevitable. However, you may be able to eliminate some collisions when the ID refers to a post of low importance, such as a revision or autosave.</p>';
+            echo '<p>The below tables allow you to eliminate post, taxonomy term and comment ID collisions, one ID at a time. For each ID, you must select just ONE entity to keep. All others with the same ID will be immediately and irretrievably deleted.</p>';
+
+            if ( in_array( $entity, array( 'term_taxonomy', 'terms' ), true ) ) echo '<div class="notice notice-warning inline"><p><strong>Note:</strong> Default taxonomy terms can not be deleted! If a default taxonomy term is in a collision, you must go to Writing Settings and select a new default term for the taxonomy before you can eliminate the collision.</p></div>';
+
+            echo '<form method="post" action="">';
+            echo '<table class="widefat">';
+            echo '<thead><tr><th scope="col">Keep?</th><th scope="col">' . $labels[ $entity ][0] . '</th><th scope="col">' . $labels[ $entity ][1] . '</th><th scope="col">' . $labels[ $entity ][2] . '</th><th scope="col">' . $labels[ $entity ][3] . '</th><th scope="col">' . $labels[ $entity ][4] . '</th></tr></thead>';
+            echo '<tbody>';
+
+            foreach ( $this->blogs as $blog )
+            {
+                $tables = array(
+                    'comments' => $blog->table( 'comments' ) . ' LEFT JOIN ' . $blog->table( 'posts' ) . ' ON comment_post_ID = ID',
+                    'posts' => $blog->table( 'posts' ),
+                    'term_taxonomy' => $blog->table( 'term_taxonomy' ) . ' tt LEFT JOIN ' . $blog->table( 'terms' ) . ' t ON tt.term_id = t.term_id',
+                    'terms' => $blog->table( 'term_taxonomy' ) . ' tt LEFT JOIN ' . $blog->table( 'terms' ) . ' t ON tt.term_id = t.term_id'
+                );
+
+                $rows = $GLOBALS['wpdb']->get_results( 'SELECT `' . $fields[ $entity ][0] . '`, SUBSTRING(`' . $fields[ $entity ][1] . '`, 1, 500) AS `' . $fields[ $entity ][1] . '_preview`, `' . $fields[ $entity ][2] . '`, `' . $fields[ $entity ][3] . '` FROM ' . $tables[ $entity ] . ' WHERE `' . $id . '` = ' . $this->collisions[ $entity ][0], ARRAY_A );
+
+                // There may be more than one row if terms are not split.
+                foreach ( $rows as $key => $row )
                 {
                     echo '<tr>';
-                    echo '<td><input type="radio" id="supernetwork__' . esc_textarea( $site['guid'] ) . '" value="' . esc_textarea( $site['guid'] ) . '" name="supernetwork_post_collision_' . $old_collisions[0] . '"></td>';
-                    echo '<td><label for="supernetwork__' . esc_textarea( $site['guid'] ) . '">' . esc_textarea( $site['guid'] ) . '</label></td>';
-                    echo '<td><label for="supernetwork__' . esc_textarea( $site['guid'] ) . '">' . esc_textarea( $site['post_title'] ) . '</label></td>';
-                    echo '<td><label for="supernetwork__' . esc_textarea( $site['guid'] ) . '">' . esc_textarea( $site['post_preview'] ) . '</label></td>';
-                    echo '<td><label for="supernetwork__' . esc_textarea( $site['guid'] ) . '">' . esc_textarea( $site['post_type'] ) . '</label></td>';
-                    echo '<td><label for="supernetwork__' . esc_textarea( $site['guid'] ) . '">' . esc_textarea( $site['post_status'] ) . '</label></td>';
+                    echo '<td><input type="radio" id="supernetwork__' . esc_attr( $blog->id ) . '_' . $key . '" value="' . esc_attr( $blog->id ) . '" name="supernetwork_' . $entity . '_collision_' . $this->collisions[ $entity ][0] . '"></td>';
+                    echo '<td><label for="supernetwork__' . esc_attr( $blog->id ) . '_' . $key . '">' . esc_html( $blog->name ) . '</label></td>';
+                    echo '<td><label for="supernetwork__' . esc_attr( $blog->id ) . '_' . $key . '">' . esc_html( $row[ $fields[ $entity ][0] ] ) . '</label></td>';
+                    echo '<td><label for="supernetwork__' . esc_attr( $blog->id ) . '_' . $key . '">' . esc_html( $row[ $fields[ $entity ][1] . '_preview' ] ) . '</label></td>';
+                    echo '<td><label for="supernetwork__' . esc_attr( $blog->id ) . '_' . $key . '">' . esc_html( $row[ $fields[ $entity ][2] ] ) . '</label></td>';
+                    echo '<td><label for="supernetwork__' . esc_attr( $blog->id ) . '_' . $key . '">' . esc_html( $row[ $fields[ $entity ][3] ] ) . '</label></td>';
                     echo '</tr>';
                 }
-
-                $this->collisions = $old_collisions;
-                $this->post_types = $old_post_types;
-
-                echo '</tbody></table>';
-                submit_button( 'Keep Selected and Delete All Others' );
-                echo '</form>';
-            }
-        }
+            }
+
+            echo '</tbody></table>';
+            submit_button( 'Keep Selected and Delete All Others' );
+            echo '</form>';
+        }
+
+        $this->consolidated = true;
+    }
         else
         {
@@ -419 +755 @@
     public function intercept_query( $query )
     {
-        try
-        {
-            $parsed = $this->parser->parse( $query );
-
-            // Insert, update and delete queries are not currently modified.
-            return $this->modify_query( $parsed ) ? $this->creator->create( $parsed ) : $query;
-        }
-        catch ( \PHPSQLParser\exceptions\UnsupportedFeatureException $uf )
-        {
-            return $query;
-        }
-        catch ( \PHPSQLParser\exceptions\UnableToCreateSQLException $utcsql )
-        {
-            return $query;
-        }
-    }
-
-    private function modify_query( &$parsed )
-    {
-        if ( in_array( array_keys( $parsed )[0], array( 'UNION', 'SELECT' ), true ) )
-        {
-            if ( isset( $parsed['UNION'] ) )
-            {
-                foreach ( $parsed['UNION'] as &$query )
-                {
-                    $this->modify_query( $query );
-                }
-            }
-            else
-            {
-                if ( isset( $parsed['SELECT'] ) && isset( $parsed['FROM'] ) )
-                {
-                    foreach ( $parsed['FROM'] as &$from )
-                    {
-                        if ( !empty( $from['sub_tree'] ) )
-                        {
-                            $this->modify_query( $from['sub_tree'] );
-                        }
-                        else
-                        {
-                            foreach ( array_keys( self::ID_COLS ) as $table )
-                            {
-                                $local_table = $GLOBALS['wpdb']->__get( $table );
-
-                                if ( isset( $from['table'] ) && $from['table'] === $local_table )
-                                {
-                                    if ( ( $union = $this->union( $table ) ) === $from['table'] )
-                                    {
-                                        continue;
-                                    }
-
-                                    $from['expr_type'] = 'subquery';
-                                    $from['sub_tree'] = $this->parser->parse( $union );
-
-                                    if ( false === $from['alias'] )
-                                    {
-                                        $from['alias'] = array(
-                                            'as' => false,
-                                            'name' => $local_table,
-                                            'no_quotes' => array(
-                                                'delim' => false,
-                                                'parts' => array( $local_table )
-                                            ),
-                                            'base_expr' => $local_table
-                                        );
-                                    }
-
-                                    unset( $from['table'] );
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    foreach ( array( 'WHERE', 'HAVING' ) as $clause )
-                    {
-                        if ( isset( $parsed[ $clause ] ) )
-                        {
-                            foreach ( $parsed[ $clause ] as &$subclause )
-                            {
-                                if ( !empty( $subclause['sub_tree'] ) )
-                                {
-                                    $this->modify_query( $subclause['sub_tree'] );
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            return true;
-        }
-
-        return false;
+        $cache = wp_cache_get( 'supernetwork_queries', $query );
+
+        if ( $cache )
+        {
+            return $cache->transformed;
+        }
+        else
+        {
+            $transformed = new Query( $query, $this );
+            wp_cache_set( 'supernetwork_queries', $transformed, $query );
+            return $transformed->transformed;
+        }
     }
 
     public function intercept_permalink( $permalink, $post_ID )
     {
-        // Prevent infinite loop
-        if ( empty( $GLOBALS['_wp_switched_stack'] ) )
-        {
-            if ( !is_null( $blog = $this->get_blog( $post_ID ) ) )
-            {
-                switch_to_blog( $blog->id );
-                $permalink = get_permalink( $post_ID );
-                restore_current_blog();
-            }
+        if ( !doing_filter( 'supernetwork_preview_link' ) && !is_null( $blog = $this->get_blog( $post_ID ) ) )
+        {
+            switch_to_blog( $blog->id );
+            $permalink = get_permalink( $post_ID );
+            restore_current_blog();
         }
 
@@ -536 +786 @@
     }
 
-    public function intercept_capability_write( $caps, $cap, $user_id, $args )
-    {
-        if ( in_array( $cap, array( 'delete_post', 'edit_post', 'publish_post' ), true ) )
-        {
-            if ( !is_null( $blog = $this->get_blog( get_post( $args[0] )->ID ) ) && get_current_blog_id() !== $blog->id )
-            {
-                return array( 'do_not_allow' );
-            }
-        }
-
-        return $caps;
-    }
-
-    public function intercept_capability_read( $allcaps, $caps, $args, $user )
-    {
-        if ( $args[0] === 'read_post' )
+    public function intercept_preview_link( $preview_link, $post )
+    {
+        return doing_filter( 'supernetwork_preview_link' ) ? $preview_link : apply_filters( 'supernetwork_preview_link', $preview_link, $post );
+    }
+
+    public function replace_preview_link( $preview_link, $post )
+    {
+        $query_args = array();
+        parse_str( parse_url( $preview_link, PHP_URL_QUERY ), $query_args );
+        return get_preview_post_link( $post, array_intersect_key( $query_args, array( 'preview_nonce' => null, 'preview_id' => null ) ) );
+    }
+
+    public function intercept_capability( $allcaps, $caps, $args, $user )
+    {
+        if ( in_array( $args[0], array( 'delete_post', 'edit_post', 'publish_post', 'read_post' ), true ) )
         {
             if ( !is_null( $blog = $this->get_blog( get_post( $args[2] )->ID ) ) )
@@ -564 +813 @@
     public function singular_access( $false, $wp_query )
     {
-        if ( $wp_query->is_singular() && !is_admin() && ( !defined( 'REST_REQUEST' ) || !REST_REQUEST ) && isset( $wp_query->post ) && !is_null( $blog = $this->get_blog( $wp_query->post->ID ) ) && get_current_blog_id() !== $blog->id )
+        if ( $wp_query->is_singular() && !is_admin() && ( !defined( 'REST_REQUEST' ) || !REST_REQUEST ) && !is_preview() && isset( $wp_query->post ) && !is_null( $this->get_blog( $wp_query->post->ID ) ) )
         {
             $wp_query->set_404();
@@ -575 +824 @@
     }
 
-    private function get_blog( $id )
-    {
-        if ( !in_array( (string) $id, $this->collisions, true ) )
-        {
+    public function preview_access()
+    {
+        if ( is_preview() && !is_null( $blog = $this->get_blog( get_the_ID() ) ) )
+        {
+            switch_to_blog( $blog->id );
+        }
+    }
+
+    public function get_blog( $id, $entity = 'posts' )
+    {
+        if ( in_array( $entity, array_keys( WP_Super_Network::ENTITIES_TO_REPLACE ), true ) && !in_array( (string) $id, $this->collisions[ $entity ], true ) && ( $this->consolidated || !empty( $this->republished ) && $entity !== 'posts' || in_array( (string) $id, $this->republished, true ) ) )
+        {
+            if ( isset( $this->blog_cache[ $entity ][ $id ] ) ) return get_current_blog_id() === $this->blog_cache[ $entity ][ $id ]->id ? null : $this->blog_cache[ $entity ][ $id ];
+
+            $republished = null;
+            $extra_where = '';
+
+            // `ID` comes before `post_parent` in the `posts` sub-array, so `ID` will be correctly returned.
+            $col = array_search( $entity, WP_Super_Network::TABLES_TO_REPLACE[ $entity ], true );
+            $select = $entity === 'posts' ? 'post_type' : $col;
+
             $old_consolidated = $this->consolidated;
             $old_republished = $this->republished;
@@ -587 +853 @@
             foreach ( $this->blogs as $blog )
             {
-                if ( !empty( $GLOBALS['wpdb']->get_col( 'select ID from ' . $blog->table( 'posts' ) . ' where ID = ' . $id . ' limit 1' ) ) )
+                if ( !$old_consolidated )
+                {
+                    isset( $republished ) or $republished = '(' . implode( ', ', $old_republished ) . ')';
+
+                    // The `AND 1=1` is to avoid a bug in the SQL parser caused by consecutive brackets.
+                    $entity !== 'comments' or $extra_where = ' AND `comment_post_ID` IN ' . $republished . ' AND 1=1';
+                    $entity !== 'term_taxonomy' or $extra_where = ' AND EXISTS (SELECT * FROM `' . $blog->table( 'term_relationships' ) . '` WHERE `term_taxonomy_id` = ' . $id . ' AND `object_id` IN ' . $republished . ' AND 1=1)';
+                    $entity !== 'terms' or $extra_where = ' AND EXISTS (SELECT * FROM `' . $blog->table( 'term_relationships' ) . '` WHERE `term_taxonomy_id` IN (SELECT `term_taxonomy_id` FROM ' . $blog->table( 'term_taxonomy' ) . ' WHERE `term_id` = ' . $id . ') AND `object_id` IN ' . $republished . ' AND 1=1)';
+                }
+
+                $result = $GLOBALS['wpdb']->get_var( 'SELECT `' . $select . '` FROM `' . $blog->table( $entity ) . '` WHERE `' . $col . '` = ' . $id . $extra_where . ' LIMIT 1' );
+
+                if ( !empty( $result ) )
                 {
                     $this->consolidated = $old_consolidated;
                     $this->republished = $old_republished;
 
-                    return $blog;
+                    $this->blog_cache[ $entity ][ $id ] = $this->consolidated && in_array( $result, $this->post_types, true ) && !$blog->is_network() ? null : $blog;
+                    return get_current_blog_id() === $blog->id ? null : $this->blog_cache[ $entity ][ $id ];
                 }
             }
@@ -600 +879 @@
         }
 
-        return null;
+        return $this->blog_cache[ $entity ][ $id ] = null;
+    }
+
+    public function get_blog_by_id( $id )
+    {
+        return isset( $this->blogs[ $id ] ) ? $this->blogs[ $id ] : null;
     }
 }

wp-super-network/tags/1.2.0/src/plugin.php

@@ -7 +7 @@
 class WP_Super_Network
 {
+    const ENTITIES_TO_REPLACE = array(
+        'comments' => array(),
+        'posts' => array(),
+        'term_taxonomy' => array(),
+        'terms' => array()
+    );
+
+    const TABLES_TO_REPLACE = array(
+        'commentmeta' => array(
+            'comment_id' => 'comments'
+        ),
+        'comments' => array(
+            'comment_ID' => 'comments',
+            'comment_post_ID' => 'posts'
+        ),
+        'postmeta' => array(
+            'post_id' => 'posts'
+        ),
+        'posts' => array(
+            'ID' => 'posts',
+            'post_parent' => 'posts'
+        ),
+        'term_relationships' => array(
+            'object_id' => 'posts',
+            'term_taxonomy_id' => 'term_taxonomy'
+        ),
+        'term_taxonomy' => array(
+            'term_id' => 'terms',
+            'term_taxonomy_id' => 'term_taxonomy'
+        ),
+        'termmeta' => array(
+            'term_id' => 'terms'
+        ),
+        'terms' => array(
+            'term_id' => 'terms'
+        )
+    );
+
     /**
      * Static instance of the plugin.
@@ -45 +83 @@
     }
 
-    function options( $value, $option )
+    public static function options( $value, $option, $default )
     {
         if ( !is_main_site() )
         {
-            switch_to_blog( get_main_site_id() );
-            $value = get_option( $option );
-            restore_current_blog();
+            $main = get_main_site_id();
+
+            if ( $main > 0 )
+            {
+                switch_to_blog( $main );
+                $value = get_option( $option, $default );
+                restore_current_blog();
+            }
+            else
+            {
+                if ( in_array( $option, array( 'supernetwork_consolidated', 'supernetwork_post_types', 'supernetwork_options' ), true ) )
+                {
+                    $value = $default;
+                }
+            }
+
+            if ( $value === false )
+            {
+                add_filter( 'option_' . $option, '__return_false' );
+            }
         }
 
@@ -57 +112 @@
     }
 
+    public static function add_option( $option, $value )
+    {
+        if ( !is_main_site() && has_filter( 'pre_option_' . $option, array( __CLASS__, 'options' ) ) )
+        {
+            $main = get_main_site_id();
+
+            if ( $main > 0 && current_user_can_for_blog( $main, 'manage_options' ) )
+            {
+                switch_to_blog( $main );
+                add_option( $option, $value );
+                restore_current_blog();
+            }
+        }
+    }
+
+    public static function update_option( $option, $old_value, $value )
+    {
+        if ( !is_main_site() && has_filter( 'pre_option_' . $option, array( __CLASS__, 'options' ) ) )
+        {
+            $main = get_main_site_id();
+
+            if ( $main > 0 && current_user_can_for_blog( $main, 'manage_options' ) )
+            {
+                switch_to_blog( $main );
+                update_option( $option, $value );
+                restore_current_blog();
+            }
+        }
+    }
+
     /**
      * Launch the initialization process.
@@ -64 +149 @@
     public function run()
     {
+        // Complete this before accessing the option on next line
+        add_filter( 'pre_option_supernetwork_options', array( __CLASS__, 'options' ), 10, 3 );
+        add_filter( 'pre_option_supernetwork_post_types', array( __CLASS__, 'options' ), 10, 3 );
+        add_filter( 'pre_option_supernetwork_consolidated', array( __CLASS__, 'options' ), 10, 3 );
+
+        foreach ( get_option( 'supernetwork_options', array() ) as $option => $val )
+        {
+            if ( $val && strpos( $option, '_' ) !== 0 && strpos( $option, 'supernetwork_' ) !== 0 )
+            {
+                add_filter( 'pre_option_' . $option, array( __CLASS__, 'options' ), 10, 3 );
+            }
+        }
+
+        add_filter( 'add_option', array( __CLASS__, 'add_option' ), 10, 2 );
+        add_filter( 'update_option', array( __CLASS__, 'update_option' ), 10, 3 );
+
+        // Disable querying of meta ID. See issue #10
+        add_filter( 'update_comment_metadata_by_mid', '__return_false' );
+        add_filter( 'update_post_metadata_by_mid', '__return_false' );
+        add_filter( 'update_term_metadata_by_mid', '__return_false' );
+        add_filter( 'delete_comment_metadata_by_mid', '__return_false' );
+        add_filter( 'delete_post_metadata_by_mid', '__return_false' );
+        add_filter( 'delete_term_metadata_by_mid', '__return_false' );
+
+        $this->network->register();
+
         // Load functions
-        add_filter( 'post_type_link', array( $this->network, 'intercept_permalink_for_post' ), 10, 2 );
-        add_filter( 'post_link', array( $this->network, 'intercept_permalink_for_post' ), 10, 2 );
-        add_filter( 'page_link', array( $this->network, 'intercept_permalink' ), 10, 2 );
-        add_filter( 'map_meta_cap', array( $this->network, 'intercept_capability_write' ), 10, 4 );
-        add_filter( 'user_has_cap', array( $this->network, 'intercept_capability_read' ), 10, 4 );
-        add_filter( 'pre_handle_404', array( $this->network, 'singular_access' ), 10, 2 );
-        add_filter( 'query', array( $this->network, 'intercept_query' ), 10, 2 );
-        add_filter( 'wp_insert_post', array( $this->network, 'shared_auto_increment' ), 10, 3 );
         add_filter( 'network_admin_menu', array( $this, 'summary' ) );
-
-        if ( is_main_site() ) $this->network->register_pages();
-
-        // Complete this before accessing the option on next line
-        add_filter( 'pre_option_supernetwork_options', array( $this, 'options' ), 10, 2 );
-        add_filter( 'pre_option_supernetwork_post_types', array( $this, 'options' ), 10, 2 );
-        add_filter( 'pre_option_supernetwork_consolidated', array( $this, 'options' ), 10, 2 );
-        
-        foreach ( (array) get_option( 'supernetwork_options' ) as $option => $val )
-        {
-            if ( $val && strpos( $option, '_' ) !== 0 && strpos( $option, 'supernetwork_' ) !== 0 )
-            {
-                add_filter( 'pre_option_' . $option, array( $this, 'options' ), 10, 2 );
-            }
-        }
-
-        $this->network->consolidated = !empty( get_option( 'supernetwork_consolidated' )['consolidated'] );
 
         if ( !$this->network->consolidated )
@@ -154 +240 @@
             if ( current_user_can( 'edit_post', $post->ID ) )
             {
-                if ( in_array( (string) $post->ID, $this->network->collisions, true ) )
+                $collisions = $this->network->collisions;
+
+                if ( array_intersect( get_comments( 'fields=ids&post_id=' . $post->ID ), $collisions['comments'] ) !== array() || in_array( (string) $post->ID, $collisions['posts'], true ) || array_intersect( wp_get_object_terms( $post->ID, array_keys( $GLOBALS['wp_taxonomies'] ), 'fields=tt_ids' ), $collisions['term_taxonomy'] ) !== array() || array_intersect( wp_get_object_terms( $post->ID, array_keys( $GLOBALS['wp_taxonomies'] ), 'fields=ids' ), $collisions['terms'] ) !== array() )
                 {
                     $actions['republish'] = '<i style="color: #888;">' . __( 'Can&apos;t Republish', 'supernetwork' ) . '</i>';

wp-super-network/tags/1.2.0/wp-super-network.php

@@ -4 +4 @@
  * Plugin URI:
  * Description: Share content between sites and create offspring networks.
- * Version: 1.1.0
+ * Version: 1.2.0
  * Requires at least: 5.0
- * Requires PHP: 5.6
+ * Requires PHP: 7.2
  * Author: Ask Carlo
  * Author URI: https://askcarlo.com

wp-super-network/trunk/init.php

@@ -24 +24 @@
 require_once SUPER_NETWORK_DIR . 'vendor/autoload.php';
 
+// Load superclasses.
+require_once SUPER_NETWORK_DIR . 'src/node.php';
+
 // Load classes.
 require_once SUPER_NETWORK_DIR . 'src/blog.php';
+require_once SUPER_NETWORK_DIR . 'src/expression.php';
 require_once SUPER_NETWORK_DIR . 'src/field.php';
+require_once SUPER_NETWORK_DIR . 'src/insert.php';
 require_once SUPER_NETWORK_DIR . 'src/network.php';
 require_once SUPER_NETWORK_DIR . 'src/page.php';
 require_once SUPER_NETWORK_DIR . 'src/plugin.php';
+require_once SUPER_NETWORK_DIR . 'src/query.php';
 require_once SUPER_NETWORK_DIR . 'src/section.php';
+require_once SUPER_NETWORK_DIR . 'src/subquery.php';
+require_once SUPER_NETWORK_DIR . 'src/table.php';
 
 // Initialize the plugin.

wp-super-network/trunk/readme.txt

@@ -2 +2 @@
 Contributors: manfcarlo
 Tags: network, multisite, share, sharing, move, migrate, migration, duplicate, syndication, content, management
-Tested up to: 5.9
-Stable tag: 1.1.0
+Tested up to: 6.1
+Stable tag: 1.2.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -40 +40 @@
 = How do I republish a page to the whole network? =
 
-As of version 1.0.5, you could flag any post or page on a main site for republication by finding it on the Posts or Pages screen and clicking Republish, but it would not take any effect. Version 1.1.0 now implements the behaviour of this feature!
+Flag any post or page on a main site for republication by finding it on the Posts or Pages screen and clicking Republish.
 
 After you have republished the post or page, it will start showing up across every site on your network. You can also access the network admin and click on Super Network. You will see a list of all posts and pages across all sites in the network that have been flagged for republication.
@@ -52 +52 @@
 = How do I turn an existing site into the main site for a new network? =
 
-This feature is still to come.
+This feature is scheduled for the next major release.
 
 = How do I manage all of my sites in a single admin area? =
@@ -62 +62 @@
 If two or more sites on a network have a post with the same numeric ID, none of these posts is able to be accessed on consolidated mode. You can eliminate post ID collisions by deleting posts you don't want via the network admin screen > Super Network.
 
-= Why are republished posts and pages not editable in the admin area? =
+= Is this the same as Global Terms? =
 
-This feature is still to come.
+No!
+
+WP Super Network does not enable any "global" data relationships. The data you can create with WP Super Network is the same as the data you can create without it. WP Super Network merely brings the management and the viewing of the data together into the one place.
+
+= Is this the same as WP Multi Network? =
+
+No!
+
+WP Super Network is compatible with multi-network environments, but it does not include the management tools that WP Multi Network includes. Therefore, the two plugins have different purposes and can work well together.
+
+= Is this the same as Distributor? =
+
+No!
+
+WP Super Network does not duplicate content between sites, and all posts will always continue to have one and only one permalink. Posts from across the network may preview in archives, but their permalinks will always direct back to their original respective sites.
+
+= Is this the same as MainWP? =
+
+Only a little bit.
+
+WP Super Network and MainWP share a few similar features. However, MainWP is only a good fit for users who don't use the block editor and don't use multisite, since MainWP is yet to announce any support for the block editor and MainWP's own documentation states that it does not test or support multisite. This is despite the block editor and multisite both being core WordPress features for a significant number of years.
+
+Also, MainWP's features do not integrate with the core WordPress interface and can only be accessed through its own specially-built interface.
+
+Although WP Super Network requires multisite, it does not require you to learn a new interface. Instead, you can continue working with the core WordPress interfaces you are already familiar with, including both the block editor and classic editor.
+
+= Which plugins are incompatible with WP Super Network? =
+
+WP Super Network is incompatible with [Link Manager](https://wordpress.org/plugins/link-manager/). Users of Link Manager will not be supported and are advised to not install WP Super Network.
+
+WP Super Network is currently incompatible with [SQLite Database Integration](https://wordpress.org/plugins/sqlite-database-integration/). Users of SQLite Database Integration are advised to not install WP Super Network for the time being. Compatibility is planned for a later release, so check back later.
+
+If you use a plugin that adds a db.php drop-in, it may or may not be incompatible with WP Super Network. To know if you have a db.php drop-in, go to the Plugins screen, click on Drop-in and check if db.php is listed. If the db.php drop-in was added by a plugin that follows the WordPress conventions well and has high user ratings, you are unlikely to see any incompatibility issues with WP Super Network, but you are welcome to ask on the support forum.
+
+= Is WP Super Network safe to install? =
+
+See above question about incompatible plugins.
+
+For best results, the free version of WP Super Network should be activated on a fresh network. While results will vary, you may find that some features (e.g. consolidated mode) are limited in utility for existing networks and/or cause a slow-down in performance for large networks.
+
+None the less, the utmost care has been taken to avoid permanent data loss or corruption. Keeping regular database back-ups is always recommended, but deactivating the plugin should return your network back to its previous state.
+
+A premium version is planned for the future, focusing on enhanced performance for medium-to-large networks.
 
 = How do I suggest a new feature or submit a bug report? =
@@ -71 +113 @@
 
 == Changelog ==
+
+= 1.2.0 =
+* Republished posts and pages can be inserted, updated and deleted
+* Availability of taxonomies and comments for republished posts
+* Changed behaviour of select queries that target a specific post
+* Cache implemented for duplicate queries
+* Fixed a few bugs with network-based options
+* Minimum PHP version lifted to 7.2
 
 = 1.1.0 =

wp-super-network/trunk/src/blog.php

@@ -38 +38 @@
             return $this->wp_site->site_id;
         }
+
+        if ( $key === 'name' )
+        {
+            return $this->wp_site->blogname;
+        }
     }
     

wp-super-network/trunk/src/network.php

@@ -7 +7 @@
 class Network
 {
-    const ID_COLS = array(
-        'comments' => 'comment_post_ID',
-        'postmeta' => 'post_id',
-        'posts' => 'ID',
-        'term_relationships' => 'object_id'
-    );
-
     /**
      * Supernetwork
@@ -54 +47 @@
     private $page;
 
-    private $parser;
-    private $creator;
-
-    private $collisions = array();
+    /**
+     * Keeps track of ID collisions.
+     *
+     * @since 1.2.0
+     * @var array
+     */
+    private $collisions = WP_Super_Network::ENTITIES_TO_REPLACE;
+
+    /**
+     * Cache that maps ID's to blogs.
+     *
+     * @since 1.2.0
+     * @var array
+     */
+    private $blog_cache = WP_Super_Network::ENTITIES_TO_REPLACE;
+
     private $republished = array();
     private $post_types = array();
 
+    private $meta_ids = array();
+
     public function shared_auto_increment( $post_ID, $post, $update )
     {
@@ -69 +76 @@
     }
 
-    private function set_auto_increment( $new )
+    public function auto_increment_comments( $id, $comment )
+    {
+        if ( $this->consolidated || in_array( (string) $comment->comment_post_ID, $this->republished, true ) )
+        {
+            $this->set_auto_increment( $id + 1, 'comments' );
+        }
+    }
+
+    public function auto_increment_terms( $term_id, $tt_id, $taxonomy, $args )
+    {
+        if ( $this->consolidated )
+        {
+            $this->set_auto_increment( $tt_id + 1, 'term_taxonomy' );
+            $this->set_auto_increment( $term_id + 1, 'terms' );
+        }
+    }
+
+    public function auto_increment_term_relationships( $object_id, $tt_id, $taxonomy )
+    {
+        if ( !$this->consolidated && in_array( (string) $object_id, $this->republished, true ) )
+        {
+            $this->set_auto_increment( $tt_id + 1, 'term_taxonomy' );
+            $term = get_term_by( 'term_taxonomy_id', $tt_id ) and $this->set_auto_increment( $term->term_id + 1, 'terms' );
+        }
+    }
+
+    private function set_auto_increment( $new, $entity = 'posts' )
     {
         foreach ( $this->blogs as $blog )
         {
-            if ( $new > (int) $GLOBALS['wpdb']->get_var( 'select auto_increment from information_schema.tables where table_schema = \'' . DB_NAME . '\' and table_name = \'' . $blog->table( 'posts' ) . '\'' ) )
-            {
-                $GLOBALS['wpdb']->query( 'alter table ' . $blog->table( 'posts' ) . ' auto_increment = ' . (string) $new );
+            if ( $new > (int) $GLOBALS['wpdb']->get_var( 'SELECT `auto_increment` FROM `information_schema`.`tables` WHERE `table_schema` = \'' . DB_NAME . '\' AND `table_name` = \'' . $blog->table( $entity ) . '\'' ) )
+            {
+                $GLOBALS['wpdb']->query( 'ALTER TABLE `' . $blog->table( $entity ) . '` AUTO_INCREMENT = ' . (string) $new );
             }
         }
@@ -96 +129 @@
             return $this->republished;
         }
-    }
-
-    public function __set( $key, $value )
-    {
-        if ( $key === 'consolidated' )
-        {
-            if ( $value === true )
-            {
-                $this->consolidated = true;
-            }
-            
-            if ( $value === false )
-            {
-                $this->consolidated = false;
-
-                if ( !empty( $this->republished ) )
-                {
-                    $this->set_auto_increment( $this->republished[0] + 1 );
-                }
-            }
-        }
-    }
-
-    private function union( $table )
-    {
-        if ( !$this->consolidated && empty( $this->republished ) )
+
+        if ( $key === 'post_types' )
+        {
+            return $this->post_types;
+        }
+    }
+
+    public function union( $table )
+    {
+        // No need to do anything if not consolidated and no republished posts.
+        if ( !$this->consolidated && ( empty( $this->republished ) || empty( $post_cols = array_keys( WP_Super_Network::TABLES_TO_REPLACE[ $table ], 'posts', true ) ) ) )
         {
             return $GLOBALS['wpdb']->__get( $table );
@@ -131 +149 @@
         {
             $where = array();
-
-            if ( $this->consolidated )
-            {
-                if ( !empty( $this->collisions ) )
-                {
-                    $where[] = self::ID_COLS[ $table ] . ' not in (' . implode( ', ', $this->collisions ) . ')';
-                }
-
-                if ( $table === 'posts' && !empty( $this->post_types ) && !$blog->is_network() )
-                {
-                    $where[] = 'post_type not in (\'' . implode( '\', \'', $this->post_types ) . '\')';
-                }
-            }
-            else
-            {
+            $this->exclude( $where, $table, $blog );
+
+            if ( !$this->consolidated )
+            {
+                // Add republished posts.
                 if ( $blog->table( $table ) !== $GLOBALS['wpdb']->__get( $table ) )
                 {
-                    $where[] = self::ID_COLS[ $table ] . ' in (' . implode( ', ', $this->republished ) . ')';
+                    foreach ( $post_cols as $col )
+                    {
+                        // Post parent is currently not being handled.
+                        $col === 'post_parent' or $where[] = '`' . $col . '` IN (' . implode( ', ', $this->republished ) . ')';
+                    }
                 }
             }
 
-            $tables[] = 'select * from ' . $blog->table( $table ) . ( empty( $where ) ? '' : ( ' where ' . implode( ' and ', $where ) ) );
-        }
-
-        return implode( ' union ', $tables );
+            $tables[] = 'SELECT * FROM `' . $blog->table( $table ) . ( empty( $where ) ? '`' : ( '` WHERE ' . implode( ' AND ', $where ) ) );
+        }
+
+        return implode( ' UNION ALL ', $tables );
+    }
+
+    public function exclude( &$where, $table, $blog, $alias = '' )
+    {
+        if ( $this->consolidated )
+        {
+            empty( $alias ) or $alias .= '.';
+
+            // Exclude any entities involved in collisions.
+            foreach ( array_keys( $this->collisions ) as $entity )
+            {
+                if ( !empty( $this->collisions[ $entity ] ) )
+                {
+                    foreach ( array_keys( WP_Super_Network::TABLES_TO_REPLACE[ $table ], $entity, true ) as $col )
+                    {
+                        $where[] = $alias . '`' . $col . '` NOT IN (' . implode( ', ', $this->collisions[ $entity ] ) . ')';
+                    }
+                }
+            }
+
+            // Exclude network-based post types.
+            if ( $table === 'posts' && !empty( $this->post_types ) && !$blog->is_network() )
+            {
+                $where[] = $alias . '`post_type` NOT IN (\'' . implode( '\', \'', $this->post_types ) . '\')';
+            }
+        }
     }
 
     public function report_collisions()
     {
-        if ( $this->consolidated && !empty( $this->collisions ) && current_user_can( 'manage_network_options' ) )
-        {
-            echo '<div class="notice notice-error"><p><strong>WP Super Network detected ' . count( $this->collisions ) . ' post ID collisions</strong> across your network! These posts have been temporarily hidden. To access them again, please turn off consolidated mode.</p></div>';
+        $term_collisions = count( $this->collisions['term_taxonomy'] ) + count( $this->collisions['terms'] );
+
+        if ( $this->consolidated && ( !empty( $this->collisions['posts'] ) || $term_collisions > 0 || !empty( $this->collisions['comments'] ) ) && current_user_can( 'manage_network_options' ) )
+        {
+            echo '<div class="notice notice-error"><p><strong>WP Super Network detected ';
+
+            echo empty( $this->collisions['posts'] ) ? '' : count( $this->collisions['posts'] ) . ' post ID collisions';
+
+            if ( !empty( $this->collisions['posts'] ) && $term_collisions > 0 )
+            {
+                echo empty( $this->collisions['comments'] ) ? ' and ' : ', ';
+            }
+
+            echo $term_collisions > 0 ? $term_collisions . ' taxonomy term ID collisions' : '';
+
+            if ( !empty( $this->collisions['comments'] ) )
+            {
+                echo ( !empty( $this->collisions['posts'] ) || $term_collisions > 0 ) ? ' and ' : '';
+                echo count( $this->collisions['comments'] ) . ' comment ID collisions';
+            }
+
+            echo '</strong> across your network! These entities have been temporarily hidden. To access them again, please turn off consolidated mode.</p></div>';
         }
     }
@@ -169 +226 @@
      * Constructor.
      *
-     * Constructs the network.
+     * Queries sent during this method do not get modified, as the filter is applied later.
      *
      * @since 1.0.4
@@ -179 +236 @@
         foreach ( get_sites( 'network_id=' . $network->id ) as $site )
         {
-            array_push( $this->blogs, new Blog( $site ) );
-        }
-
-        add_filter( 'admin_footer', array( $this, 'report_collisions' ) );
-
-        $this->parser = new \PHPSQLParser\PHPSQLParser();
-        $this->creator = new \PHPSQLParser\PHPSQLCreator();
-
-        $this->collisions = $GLOBALS['wpdb']->get_col( 'select ID from (' . $this->union( 'posts' ) . ') posts group by ID having count(*) > 1 order by ID asc' );
-        $this->republished = $GLOBALS['wpdb']->get_col( 'select post_id from (' . $this->union( 'postmeta' ) . ') postmeta where meta_key = \'_supernetwork_share\' order by post_id desc' );
-        $this->post_types = array_keys( (array) get_option( 'supernetwork_post_types' ) );
+            $this->blogs[ (int) $site->blog_id ] = new Blog( $site );
+        }
 
         $this->page = new Settings_Page(
@@ -209 +257 @@
 
         global $wpdb;
-        $results = $wpdb->get_results( "select distinct option_name from $wpdb->options where option_name not like '\_%' and option_name not like 'supernetwork\_%' order by option_name" );
+        $results = $wpdb->get_results( "SELECT DISTINCT `option_name` FROM $wpdb->options WHERE `option_name` NOT LIKE '\_%' AND `option_name` NOT LIKE 'supernetwork\_%' ORDER BY `option_name`" );
         $labels = array();
 
@@ -252 +300 @@
             'Consolidated Mode',
             'Turn on consolidated mode?',
-            '<strong>Warning:</strong> Consolidated mode is highly unstable. It is strongly suggested that you have a REGULAR backup regime in place for your database, before activating consolidated mode.'
+            '<strong>Warning:</strong> Consolidated mode is recommended for fresh networks. If you have pre-existing data (e.g. posts and pages) on your network, some of it may not be compatible with consolidated mode.'
         );
 
@@ -263 +311 @@
     }
 
+    public function add_new_post( $hook_suffix )
+    {
+        $post_type = empty( $_GET['post_type'] ) ? 'post' : $_GET['post_type'];
+
+        if ( $hook_suffix === 'edit.php' && $this->consolidated && !in_array( $post_type, $this->post_types, true ) )
+        {
+            wp_enqueue_script(
+                'supernetwork-post-new',
+                SUPER_NETWORK_URL . 'assets/js/post-new.js',
+                array(),
+                null,
+                true
+            );
+
+            $blogs = array();
+            $type = get_post_type_object( $post_type );
+            $edit = isset( $post_type ) ? $type->cap->edit_posts : 'do_not_allow';
+            $create = isset( $post_type ) ? $type->cap->create_posts : 'do_not_allow';
+
+            foreach ( $this->blogs as $blog )
+            {
+                $id = $blog->id;
+
+                if ( current_user_can_for_blog( $id, $edit ) && current_user_can_for_blog( $id, $create ) )
+                {
+                    $blogs[ $id ] = $blog->name;
+                }
+            }
+
+            wp_add_inline_script(
+                'supernetwork-post-new',
+                'var blogs = ' . json_encode( $blogs ) . '; var currentId = "' . get_current_blog_id() . '";',
+                'before'
+            );
+        }
+    }
+
     public function post_types( $args, $field )
     {
@@ -276 +361 @@
     }
 
-    public function register_pages()
+    private function push_meta_ids( $meta_ids, $object_id )
+    {
+        $this->meta_ids[] = array( $meta_ids, $object_id );
+    }
+
+    public function meta_ids()
+    {
+        return empty( $this->meta_ids ) ? array() : $this->meta_ids[ count( $this->meta_ids ) - 1 ][0];
+    }
+
+    public function meta_object_id()
+    {
+        return empty( $this->meta_ids ) ? 0 : $this->meta_ids[ count( $this->meta_ids ) - 1 ][1];
+    }
+
+    public function pop_meta_ids()
+    {
+        array_pop( $this->meta_ids );
+    }
+
+    public function delete_meta( $meta_ids, $object_id )
+    {
+        $this->push_meta_ids( $meta_ids, $object_id );
+        return $meta_ids;
+    }
+
+    public function register()
     {
         $this->page->register();
+
+        add_filter( 'post_type_link', array( $this, 'intercept_permalink_for_post' ), 10, 2 );
+        add_filter( 'post_link', array( $this, 'intercept_permalink_for_post' ), 10, 2 );
+        add_filter( 'page_link', array( $this, 'intercept_permalink' ), 10, 2 );
+        add_filter( 'preview_post_link', array( $this, 'intercept_preview_link' ), 10, 2 );
+        add_filter( 'supernetwork_preview_link', array( $this, 'replace_preview_link' ), 10, 2 );
+        add_filter( 'user_has_cap', array( $this, 'intercept_capability' ), 10, 4 );
+        add_filter( 'pre_handle_404', array( $this, 'singular_access' ), 10, 2 );
+        add_action( 'wp', array( $this, 'preview_access' ) );
+        add_filter( 'query', array( $this, 'intercept_query' ), 10, 2 );
+        add_filter( 'wp_insert_post', array( $this, 'shared_auto_increment' ), 10, 3 );
+        add_filter( 'wp_insert_comment', array( $this, 'auto_increment_comments' ), 10, 2 );
+        add_filter( 'created_term', array( $this, 'auto_increment_terms' ), 10, 4 );
+        add_filter( 'added_term_relationship', array( $this, 'auto_increment_term_relationships' ), 10, 3 );
+        add_filter( 'admin_enqueue_scripts', array( $this, 'add_new_post' ) );
+        add_filter( 'admin_footer', array( $this, 'report_collisions' ) );
+        add_filter( 'delete_comment_meta', array( $this, 'delete_meta' ), 10, 2 );
+        add_filter( 'delete_post_meta', array( $this, 'delete_meta' ), 10, 2 );
+        add_filter( 'delete_term_meta', array( $this, 'delete_meta' ), 10, 2 );
+
+        // Comments must be queried before posts so as not to mask any comment ID collisions.
+        // Taxonomy terms must be queried before terms so as not to mask any taxonomy term ID collisions.
+        foreach ( array_keys( $this->collisions ) as $entity )
+        {
+            // `ID` comes before `post_parent` in the `posts` sub-array, so `ID` will be correctly returned.
+            $id = array_search( $entity, WP_Super_Network::TABLES_TO_REPLACE[ $entity ], true );
+
+            $this->collisions[ $entity ] = $GLOBALS['wpdb']->get_col( 'SELECT `' . $id . '` FROM `' . $GLOBALS['wpdb']->__get( $entity ) . '` GROUP BY `' . $id . '` HAVING COUNT(*) > 1 ORDER BY `' . $id . '` ASC' );
+        }
+
+        $consolidated = !empty( get_option( 'supernetwork_consolidated', array() )['consolidated'] );
+
+        if ( $consolidated )
+        {
+            $this->post_types = array_keys( get_option( 'supernetwork_post_types', array() ) );
+        }
+        else
+        {
+            $extra_where = '';
+            $extra_where_2 = '';
+            $relationships = $GLOBALS['wpdb']->term_relationships;
+            $taxonomy = $GLOBALS['wpdb']->term_taxonomy;
+
+            // The `AND 1=1` is to avoid a bug in the SQL parser caused by consecutive brackets.
+            empty( $this->collisions['comments'] ) or $extra_where .= ' AND `post_id` NOT IN (SELECT `comment_post_ID` FROM `' . $GLOBALS['wpdb']->comments . '` WHERE `comment_ID` IN (' . implode( ', ', $this->collisions[ 'comments' ] ) . ') AND 1=1)';
+
+            if ( !empty( $this->collisions['term_taxonomy'] ) )
+            {
+                $extra_where .= ' AND `post_id` NOT IN (SELECT `object_id` FROM `' . $relationships . '` WHERE `term_taxonomy_id` IN (' . implode( ', ', $this->collisions[ 'term_taxonomy' ] ) . ') AND 1=1)';
+                $extra_where_2 = ' AND `' . $relationships . '`.`term_taxonomy_id` NOT IN (' . implode( ', ', $this->collisions[ 'term_taxonomy' ] ) . ')';
+            }
+
+            empty( $this->collisions['terms'] ) or $extra_where .= ' AND `post_id` NOT IN (SELECT `object_id` FROM `' . $relationships . '` LEFT JOIN `' . $taxonomy . '` ON `' . $relationships . '`.`term_taxonomy_id` = `' . $taxonomy . '`.`term_taxonomy_id` WHERE `term_id` IN (' . implode( ', ', $this->collisions[ 'terms' ] ) . ')' . $extra_where_2 . ' AND 1=1)';
+
+            // This query requires post collisions, but not the other collisions, to be recorded.
+            $old_comment_collisions = $this->collisions['comments'];
+            $old_taxonomy_term_collisions = $this->collisions['term_taxonomy'];
+            $old_term_collisions = $this->collisions['terms'];
+
+            foreach ( array( 'comments', 'term_taxonomy', 'terms' ) as $entity ) $this->collisions[ $entity ] = array();
+
+            $this->republished = $GLOBALS['wpdb']->get_col( 'SELECT DISTINCT `post_id` FROM `' . $GLOBALS['wpdb']->postmeta . '` WHERE `meta_key` = \'_supernetwork_share\'' . $extra_where . ' ORDER BY `post_id` DESC' );
+
+            $this->collisions['comments'] = $old_comment_collisions;
+            $this->collisions['term_taxonomy'] = $old_taxonomy_term_collisions;
+            $this->collisions['terms'] = $old_term_collisions;
+        }
+
+        $this->consolidated = $consolidated;
+
+        if ( !$this->consolidated && !empty( $this->republished ) )
+        {
+            $this->set_auto_increment( $this->republished[0] + 1 );
+        }
+    }
+
+    /**
+     * Selects an entity type to be first in line for collision elimination, based on a calculated score.
+     *
+     * The score for each entity type is the median ID of its collisions, divided by the median ID overall.
+     * A score of 1 means the collisions are evenly distributed.
+     * A lower score means the collisions are concentrated on the lower ID's, which are more likely to be older entities with more references and importance.
+     *
+     * The entity type with the lowest score is selected for collision elimination.
+     *
+     * @since 1.2.0
+     */
+    private function get_entity_by_median_score()
+    {
+        // Temporarily empty collisions.
+        $old = $this->collisions;
+        $this->collisions = WP_Super_Network::ENTITIES_TO_REPLACE;
+        $scores = WP_Super_Network::ENTITIES_TO_REPLACE;
+
+        foreach ( $scores as $entity => &$score )
+        {
+            // `ID` comes before `post_parent` in the `posts` sub-array, so `ID` will be correctly returned.
+            $id = array_search( $entity, WP_Super_Network::TABLES_TO_REPLACE[ $entity ], true );
+
+            $collisions = $GLOBALS['wpdb']->get_col( 'SELECT `' . $id . '` FROM `' . $GLOBALS['wpdb']->__get( $entity ) . '` WHERE `' . $id . '` IN (SELECT `' . $id . '` FROM `' . $GLOBALS['wpdb']->__get( $entity ) . '` GROUP BY `' . $id . '` HAVING COUNT(*) > 1) ORDER BY `' . $id . '` ASC' );
+            $all = $GLOBALS['wpdb']->get_col( 'SELECT `' . $id . '` FROM `' . $GLOBALS['wpdb']->__get( $entity ) . '` ORDER BY `' . $id . '` ASC' );
+
+            $score = empty( $collisions ) ? PHP_FLOAT_MAX : $collisions[ floor( count( $collisions ) / 2 ) ] / $all[ floor( count( $all ) / 2 ) ];
+        }
+
+        $this->collisions = $old;
+        return array_search( min( $scores ), $scores );
+    }
+
+    /**
+     * Force deletes a term from a taxonomy.
+     *
+     * @since 1.2.0
+     */
+    private function force_delete_taxonomy_term( $term_id, $taxonomy )
+    {
+        // Temporarily register taxonomy to force deletion.
+        if ( !( $exists = taxonomy_exists( $taxonomy ) ) ) register_taxonomy( $taxonomy, array() );
+
+        // 0 is returned if the default term was not deleted.
+        $success = 0 !== wp_delete_term( $term_id, $taxonomy );
+
+        if ( !$exists ) unregister_taxonomy( $taxonomy );
+        return $success;
     }
 
@@ -288 +523 @@
         if ( $this->consolidated )
         {
-            echo '<h2>Post ID Collisions</h2>';
-
-            if ( !empty( $this->collisions ) && isset( $_POST['supernetwork_post_collision_' . $this->collisions[0] ] ) )
-            {
-                $this->consolidated = false;
-
-                foreach ( $this->blogs as $blog )
+        $entity = $this->get_entity_by_median_score();
+
+        $this->consolidated = false;
+
+            echo '<h2>ID Collisions</h2>';
+
+        if ( !empty( $this->collisions[ $entity ] ) && isset( $_POST[ 'supernetwork_' . $entity . '_collision_' . $this->collisions[ $entity ][0] ] ) )
+        {
+            $success = true;
+
+            foreach ( $this->blogs as $blog )
+            {
+                if ( $blog->id !== (int) explode( '_', $_POST[ 'supernetwork_' . $entity . '_collision_' . $this->collisions[ $entity ][0] ] )[0] )
                 {
                     switch_to_blog( $blog->id );
-                    
-                    if ( empty( $GLOBALS['wpdb']->get_col( 'select ID from ' . $blog->table( 'posts' ) . ' where guid = \'' . $_POST['supernetwork_post_collision_' . $this->collisions[0] ] . '\' limit 1' ) ) )
+
+                    if ( $entity === 'comments' ) wp_delete_comment( (int) $this->collisions['comments'][0], true );
+                    if ( $entity === 'posts' ) wp_delete_post( (int) $this->collisions['posts'][0], true );
+
+                    if ( $entity === 'term_taxonomy' )
                     {
-                        wp_delete_post( (int) $this->collisions[0], true );
+                        $term = $GLOBALS['wpdb']->get_row( 'SELECT `taxonomy`, `term_id` FROM `' . $GLOBALS['wpdb']->term_taxonomy . '` WHERE `term_taxonomy_id` = ' . $this->collisions['term_taxonomy'][0], ARRAY_A );
+
+                        if ( isset( $term['term_id'] ) && isset( $term['taxonomy'] ) )
+                        {
+                            $success = $this->force_delete_taxonomy_term( (int) $term['term_id'], $term['taxonomy'] ) && $success;
+                        }
+                    }
+
+                    if ( $entity === 'terms' )
+                    {
+                        $results = $GLOBALS['wpdb']->get_results( 'SELECT `taxonomy`, `term_id` FROM `' . $GLOBALS['wpdb']->term_taxonomy . '` WHERE `term_id` = ' . $this->collisions['terms'][0] );
+
+                        foreach ( $results as $result )
+                        {
+                            $success = $this->force_delete_taxonomy_term( (int) $result['term_id'], $result['taxonomy'] ) && $success;
+                        }
                     }
 
                     restore_current_blog();
                 }
-
+            }
+
+            // Start again if collision was eliminated.
+            if ( $success )
+            {
+                array_shift( $this->collisions[ $entity ] );
                 $this->consolidated = true;
-                array_shift( $this->collisions );
-            }
-
-            if ( empty( $this->collisions ) )
-            {
-                echo '<p>No collisions on this network!</p>';
-            }
-            else
-            {
-                $old_collisions = $this->collisions;
-                $old_post_types = $this->post_types;
-
-                $this->collisions = array();
-                $this->post_types = array();
-
-                echo '<p>Consolidated mode is designed for fresh networks. When activated on an existing network, a large number of ID collisions are inevitable. However, you may be able to eliminate some collisions when the ID refers to a post of low importance, such as a revision or autosave.</p>';
-                echo '<p>The below table allows you to eliminate post ID collisions, one ID at a time. For each ID, you must select just ONE post to keep. All others with the same ID will be immediately and irretrievably deleted.</p>';
-
-                echo '<form method="post" action="">';
-                echo '<table class="widefat">';
-                echo '<thead><tr><th scope="col">Keep?</th><th scope="col">GUID</th><th scope="col">Post Title</th><th scope="col">Post Preview</th><th scope="col">Post Type</th><th scope="col">Post Status</th></tr></thead>';
-                echo '<tbody>';
-
-                foreach ( $GLOBALS['wpdb']->get_results( 'select guid, post_title, substring(post_content, 1, 500) as post_preview, post_type, post_status from ' . $GLOBALS['wpdb']->posts . ' where ID = ' . $old_collisions[0], ARRAY_A ) as $site )
+                $entity = $this->get_entity_by_median_score();
+                $this->consolidated = false;
+            }
+        }
+
+        if ( empty( $this->collisions[ $entity ] ) )
+        {
+            echo '<p>No collisions on this network!</p>';
+        }
+        else
+        {
+            // `ID` comes before `post_parent` in the `posts` sub-array, so `ID` will be correctly returned.
+            $id = array_search( $entity, WP_Super_Network::TABLES_TO_REPLACE[ $entity ], true );
+            $id = 'terms' === $entity ? 't.' . $id : $id;
+
+            $fields = array(
+                'comments' => array(
+                    'post_title',
+                    'comment_content',
+                    'comment_author',
+                    'comment_author_email'
+                ),
+                'posts' => array(
+                    'post_title',
+                    'post_content',
+                    'post_type',
+                    'post_status'
+                ),
+                'term_taxonomy' => array(
+                    'name',
+                    'description',
+                    'taxonomy',
+                    'count'
+                ),
+                'terms' => array(
+                    'name',
+                    'description',
+                    'taxonomy',
+                    'count'
+                )
+            );
+
+            $labels = array(
+                'comments' => array(
+                    'Site Containing Post/Comment',
+                    'Post Containing Comment',
+                    'Comment Preview',
+                    'Comment Author',
+                    'Comment Author Email'
+                ),
+                'posts' => array(
+                    'Site Containing Post',
+                    'Post Title',
+                    'Post Preview',
+                    'Post Type',
+                    'Post Status'
+                ),
+                'term_taxonomy' => array(
+                    'Site Containing Taxonomy Term',
+                    'Taxonomy Term Name',
+                    'Taxonomy Term Description',
+                    'Taxonomy',
+                    'Post Count'
+                ),
+                'terms' => array(
+                    'Site Containing Taxonomy Term',
+                    'Taxonomy Term Name',
+                    'Taxonomy Term Description',
+                    'Taxonomy',
+                    'Post Count'
+                )
+            );
+
+            echo '<p>Consolidated mode is designed for fresh networks. When activated on an existing network, a large number of ID collisions are inevitable. However, you may be able to eliminate some collisions when the ID refers to a post of low importance, such as a revision or autosave.</p>';
+            echo '<p>The below tables allow you to eliminate post, taxonomy term and comment ID collisions, one ID at a time. For each ID, you must select just ONE entity to keep. All others with the same ID will be immediately and irretrievably deleted.</p>';
+
+            if ( in_array( $entity, array( 'term_taxonomy', 'terms' ), true ) ) echo '<div class="notice notice-warning inline"><p><strong>Note:</strong> Default taxonomy terms can not be deleted! If a default taxonomy term is in a collision, you must go to Writing Settings and select a new default term for the taxonomy before you can eliminate the collision.</p></div>';
+
+            echo '<form method="post" action="">';
+            echo '<table class="widefat">';
+            echo '<thead><tr><th scope="col">Keep?</th><th scope="col">' . $labels[ $entity ][0] . '</th><th scope="col">' . $labels[ $entity ][1] . '</th><th scope="col">' . $labels[ $entity ][2] . '</th><th scope="col">' . $labels[ $entity ][3] . '</th><th scope="col">' . $labels[ $entity ][4] . '</th></tr></thead>';
+            echo '<tbody>';
+
+            foreach ( $this->blogs as $blog )
+            {
+                $tables = array(
+                    'comments' => $blog->table( 'comments' ) . ' LEFT JOIN ' . $blog->table( 'posts' ) . ' ON comment_post_ID = ID',
+                    'posts' => $blog->table( 'posts' ),
+                    'term_taxonomy' => $blog->table( 'term_taxonomy' ) . ' tt LEFT JOIN ' . $blog->table( 'terms' ) . ' t ON tt.term_id = t.term_id',
+                    'terms' => $blog->table( 'term_taxonomy' ) . ' tt LEFT JOIN ' . $blog->table( 'terms' ) . ' t ON tt.term_id = t.term_id'
+                );
+
+                $rows = $GLOBALS['wpdb']->get_results( 'SELECT `' . $fields[ $entity ][0] . '`, SUBSTRING(`' . $fields[ $entity ][1] . '`, 1, 500) AS `' . $fields[ $entity ][1] . '_preview`, `' . $fields[ $entity ][2] . '`, `' . $fields[ $entity ][3] . '` FROM ' . $tables[ $entity ] . ' WHERE `' . $id . '` = ' . $this->collisions[ $entity ][0], ARRAY_A );
+
+                // There may be more than one row if terms are not split.
+                foreach ( $rows as $key => $row )
                 {
                     echo '<tr>';
-                    echo '<td><input type="radio" id="supernetwork__' . esc_textarea( $site['guid'] ) . '" value="' . esc_textarea( $site['guid'] ) . '" name="supernetwork_post_collision_' . $old_collisions[0] . '"></td>';
-                    echo '<td><label for="supernetwork__' . esc_textarea( $site['guid'] ) . '">' . esc_textarea( $site['guid'] ) . '</label></td>';
-                    echo '<td><label for="supernetwork__' . esc_textarea( $site['guid'] ) . '">' . esc_textarea( $site['post_title'] ) . '</label></td>';
-                    echo '<td><label for="supernetwork__' . esc_textarea( $site['guid'] ) . '">' . esc_textarea( $site['post_preview'] ) . '</label></td>';
-                    echo '<td><label for="supernetwork__' . esc_textarea( $site['guid'] ) . '">' . esc_textarea( $site['post_type'] ) . '</label></td>';
-                    echo '<td><label for="supernetwork__' . esc_textarea( $site['guid'] ) . '">' . esc_textarea( $site['post_status'] ) . '</label></td>';
+                    echo '<td><input type="radio" id="supernetwork__' . esc_attr( $blog->id ) . '_' . $key . '" value="' . esc_attr( $blog->id ) . '" name="supernetwork_' . $entity . '_collision_' . $this->collisions[ $entity ][0] . '"></td>';
+                    echo '<td><label for="supernetwork__' . esc_attr( $blog->id ) . '_' . $key . '">' . esc_html( $blog->name ) . '</label></td>';
+                    echo '<td><label for="supernetwork__' . esc_attr( $blog->id ) . '_' . $key . '">' . esc_html( $row[ $fields[ $entity ][0] ] ) . '</label></td>';
+                    echo '<td><label for="supernetwork__' . esc_attr( $blog->id ) . '_' . $key . '">' . esc_html( $row[ $fields[ $entity ][1] . '_preview' ] ) . '</label></td>';
+                    echo '<td><label for="supernetwork__' . esc_attr( $blog->id ) . '_' . $key . '">' . esc_html( $row[ $fields[ $entity ][2] ] ) . '</label></td>';
+                    echo '<td><label for="supernetwork__' . esc_attr( $blog->id ) . '_' . $key . '">' . esc_html( $row[ $fields[ $entity ][3] ] ) . '</label></td>';
                     echo '</tr>';
                 }
-
-                $this->collisions = $old_collisions;
-                $this->post_types = $old_post_types;
-
-                echo '</tbody></table>';
-                submit_button( 'Keep Selected and Delete All Others' );
-                echo '</form>';
-            }
-        }
+            }
+
+            echo '</tbody></table>';
+            submit_button( 'Keep Selected and Delete All Others' );
+            echo '</form>';
+        }
+
+        $this->consolidated = true;
+    }
         else
         {
@@ -419 +755 @@
     public function intercept_query( $query )
     {
-        try
-        {
-            $parsed = $this->parser->parse( $query );
-
-            // Insert, update and delete queries are not currently modified.
-            return $this->modify_query( $parsed ) ? $this->creator->create( $parsed ) : $query;
-        }
-        catch ( \PHPSQLParser\exceptions\UnsupportedFeatureException $uf )
-        {
-            return $query;
-        }
-        catch ( \PHPSQLParser\exceptions\UnableToCreateSQLException $utcsql )
-        {
-            return $query;
-        }
-    }
-
-    private function modify_query( &$parsed )
-    {
-        if ( in_array( array_keys( $parsed )[0], array( 'UNION', 'SELECT' ), true ) )
-        {
-            if ( isset( $parsed['UNION'] ) )
-            {
-                foreach ( $parsed['UNION'] as &$query )
-                {
-                    $this->modify_query( $query );
-                }
-            }
-            else
-            {
-                if ( isset( $parsed['SELECT'] ) && isset( $parsed['FROM'] ) )
-                {
-                    foreach ( $parsed['FROM'] as &$from )
-                    {
-                        if ( !empty( $from['sub_tree'] ) )
-                        {
-                            $this->modify_query( $from['sub_tree'] );
-                        }
-                        else
-                        {
-                            foreach ( array_keys( self::ID_COLS ) as $table )
-                            {
-                                $local_table = $GLOBALS['wpdb']->__get( $table );
-
-                                if ( isset( $from['table'] ) && $from['table'] === $local_table )
-                                {
-                                    if ( ( $union = $this->union( $table ) ) === $from['table'] )
-                                    {
-                                        continue;
-                                    }
-
-                                    $from['expr_type'] = 'subquery';
-                                    $from['sub_tree'] = $this->parser->parse( $union );
-
-                                    if ( false === $from['alias'] )
-                                    {
-                                        $from['alias'] = array(
-                                            'as' => false,
-                                            'name' => $local_table,
-                                            'no_quotes' => array(
-                                                'delim' => false,
-                                                'parts' => array( $local_table )
-                                            ),
-                                            'base_expr' => $local_table
-                                        );
-                                    }
-
-                                    unset( $from['table'] );
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    foreach ( array( 'WHERE', 'HAVING' ) as $clause )
-                    {
-                        if ( isset( $parsed[ $clause ] ) )
-                        {
-                            foreach ( $parsed[ $clause ] as &$subclause )
-                            {
-                                if ( !empty( $subclause['sub_tree'] ) )
-                                {
-                                    $this->modify_query( $subclause['sub_tree'] );
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            return true;
-        }
-
-        return false;
+        $cache = wp_cache_get( 'supernetwork_queries', $query );
+
+        if ( $cache )
+        {
+            return $cache->transformed;
+        }
+        else
+        {
+            $transformed = new Query( $query, $this );
+            wp_cache_set( 'supernetwork_queries', $transformed, $query );
+            return $transformed->transformed;
+        }
     }
 
     public function intercept_permalink( $permalink, $post_ID )
     {
-        // Prevent infinite loop
-        if ( empty( $GLOBALS['_wp_switched_stack'] ) )
-        {
-            if ( !is_null( $blog = $this->get_blog( $post_ID ) ) )
-            {
-                switch_to_blog( $blog->id );
-                $permalink = get_permalink( $post_ID );
-                restore_current_blog();
-            }
+        if ( !doing_filter( 'supernetwork_preview_link' ) && !is_null( $blog = $this->get_blog( $post_ID ) ) )
+        {
+            switch_to_blog( $blog->id );
+            $permalink = get_permalink( $post_ID );
+            restore_current_blog();
         }
 
@@ -536 +786 @@
     }
 
-    public function intercept_capability_write( $caps, $cap, $user_id, $args )
-    {
-        if ( in_array( $cap, array( 'delete_post', 'edit_post', 'publish_post' ), true ) )
-        {
-            if ( !is_null( $blog = $this->get_blog( get_post( $args[0] )->ID ) ) && get_current_blog_id() !== $blog->id )
-            {
-                return array( 'do_not_allow' );
-            }
-        }
-
-        return $caps;
-    }
-
-    public function intercept_capability_read( $allcaps, $caps, $args, $user )
-    {
-        if ( $args[0] === 'read_post' )
+    public function intercept_preview_link( $preview_link, $post )
+    {
+        return doing_filter( 'supernetwork_preview_link' ) ? $preview_link : apply_filters( 'supernetwork_preview_link', $preview_link, $post );
+    }
+
+    public function replace_preview_link( $preview_link, $post )
+    {
+        $query_args = array();
+        parse_str( parse_url( $preview_link, PHP_URL_QUERY ), $query_args );
+        return get_preview_post_link( $post, array_intersect_key( $query_args, array( 'preview_nonce' => null, 'preview_id' => null ) ) );
+    }
+
+    public function intercept_capability( $allcaps, $caps, $args, $user )
+    {
+        if ( in_array( $args[0], array( 'delete_post', 'edit_post', 'publish_post', 'read_post' ), true ) )
         {
             if ( !is_null( $blog = $this->get_blog( get_post( $args[2] )->ID ) ) )
@@ -564 +813 @@
     public function singular_access( $false, $wp_query )
     {
-        if ( $wp_query->is_singular() && !is_admin() && ( !defined( 'REST_REQUEST' ) || !REST_REQUEST ) && isset( $wp_query->post ) && !is_null( $blog = $this->get_blog( $wp_query->post->ID ) ) && get_current_blog_id() !== $blog->id )
+        if ( $wp_query->is_singular() && !is_admin() && ( !defined( 'REST_REQUEST' ) || !REST_REQUEST ) && !is_preview() && isset( $wp_query->post ) && !is_null( $this->get_blog( $wp_query->post->ID ) ) )
         {
             $wp_query->set_404();
@@ -575 +824 @@
     }
 
-    private function get_blog( $id )
-    {
-        if ( !in_array( (string) $id, $this->collisions, true ) )
-        {
+    public function preview_access()
+    {
+        if ( is_preview() && !is_null( $blog = $this->get_blog( get_the_ID() ) ) )
+        {
+            switch_to_blog( $blog->id );
+        }
+    }
+
+    public function get_blog( $id, $entity = 'posts' )
+    {
+        if ( in_array( $entity, array_keys( WP_Super_Network::ENTITIES_TO_REPLACE ), true ) && !in_array( (string) $id, $this->collisions[ $entity ], true ) && ( $this->consolidated || !empty( $this->republished ) && $entity !== 'posts' || in_array( (string) $id, $this->republished, true ) ) )
+        {
+            if ( isset( $this->blog_cache[ $entity ][ $id ] ) ) return get_current_blog_id() === $this->blog_cache[ $entity ][ $id ]->id ? null : $this->blog_cache[ $entity ][ $id ];
+
+            $republished = null;
+            $extra_where = '';
+
+            // `ID` comes before `post_parent` in the `posts` sub-array, so `ID` will be correctly returned.
+            $col = array_search( $entity, WP_Super_Network::TABLES_TO_REPLACE[ $entity ], true );
+            $select = $entity === 'posts' ? 'post_type' : $col;
+
             $old_consolidated = $this->consolidated;
             $old_republished = $this->republished;
@@ -587 +853 @@
             foreach ( $this->blogs as $blog )
             {
-                if ( !empty( $GLOBALS['wpdb']->get_col( 'select ID from ' . $blog->table( 'posts' ) . ' where ID = ' . $id . ' limit 1' ) ) )
+                if ( !$old_consolidated )
+                {
+                    isset( $republished ) or $republished = '(' . implode( ', ', $old_republished ) . ')';
+
+                    // The `AND 1=1` is to avoid a bug in the SQL parser caused by consecutive brackets.
+                    $entity !== 'comments' or $extra_where = ' AND `comment_post_ID` IN ' . $republished . ' AND 1=1';
+                    $entity !== 'term_taxonomy' or $extra_where = ' AND EXISTS (SELECT * FROM `' . $blog->table( 'term_relationships' ) . '` WHERE `term_taxonomy_id` = ' . $id . ' AND `object_id` IN ' . $republished . ' AND 1=1)';
+                    $entity !== 'terms' or $extra_where = ' AND EXISTS (SELECT * FROM `' . $blog->table( 'term_relationships' ) . '` WHERE `term_taxonomy_id` IN (SELECT `term_taxonomy_id` FROM ' . $blog->table( 'term_taxonomy' ) . ' WHERE `term_id` = ' . $id . ') AND `object_id` IN ' . $republished . ' AND 1=1)';
+                }
+
+                $result = $GLOBALS['wpdb']->get_var( 'SELECT `' . $select . '` FROM `' . $blog->table( $entity ) . '` WHERE `' . $col . '` = ' . $id . $extra_where . ' LIMIT 1' );
+
+                if ( !empty( $result ) )
                 {
                     $this->consolidated = $old_consolidated;
                     $this->republished = $old_republished;
 
-                    return $blog;
+                    $this->blog_cache[ $entity ][ $id ] = $this->consolidated && in_array( $result, $this->post_types, true ) && !$blog->is_network() ? null : $blog;
+                    return get_current_blog_id() === $blog->id ? null : $this->blog_cache[ $entity ][ $id ];
                 }
             }
@@ -600 +879 @@
         }
 
-        return null;
+        return $this->blog_cache[ $entity ][ $id ] = null;
+    }
+
+    public function get_blog_by_id( $id )
+    {
+        return isset( $this->blogs[ $id ] ) ? $this->blogs[ $id ] : null;
     }
 }

wp-super-network/trunk/src/plugin.php

@@ -7 +7 @@
 class WP_Super_Network
 {
+    const ENTITIES_TO_REPLACE = array(
+        'comments' => array(),
+        'posts' => array(),
+        'term_taxonomy' => array(),
+        'terms' => array()
+    );
+
+    const TABLES_TO_REPLACE = array(
+        'commentmeta' => array(
+            'comment_id' => 'comments'
+        ),
+        'comments' => array(
+            'comment_ID' => 'comments',
+            'comment_post_ID' => 'posts'
+        ),
+        'postmeta' => array(
+            'post_id' => 'posts'
+        ),
+        'posts' => array(
+            'ID' => 'posts',
+            'post_parent' => 'posts'
+        ),
+        'term_relationships' => array(
+            'object_id' => 'posts',
+            'term_taxonomy_id' => 'term_taxonomy'
+        ),
+        'term_taxonomy' => array(
+            'term_id' => 'terms',
+            'term_taxonomy_id' => 'term_taxonomy'
+        ),
+        'termmeta' => array(
+            'term_id' => 'terms'
+        ),
+        'terms' => array(
+            'term_id' => 'terms'
+        )
+    );
+
     /**
      * Static instance of the plugin.
@@ -45 +83 @@
     }
 
-    function options( $value, $option )
+    public static function options( $value, $option, $default )
     {
         if ( !is_main_site() )
         {
-            switch_to_blog( get_main_site_id() );
-            $value = get_option( $option );
-            restore_current_blog();
+            $main = get_main_site_id();
+
+            if ( $main > 0 )
+            {
+                switch_to_blog( $main );
+                $value = get_option( $option, $default );
+                restore_current_blog();
+            }
+            else
+            {
+                if ( in_array( $option, array( 'supernetwork_consolidated', 'supernetwork_post_types', 'supernetwork_options' ), true ) )
+                {
+                    $value = $default;
+                }
+            }
+
+            if ( $value === false )
+            {
+                add_filter( 'option_' . $option, '__return_false' );
+            }
         }
 
@@ -57 +112 @@
     }
 
+    public static function add_option( $option, $value )
+    {
+        if ( !is_main_site() && has_filter( 'pre_option_' . $option, array( __CLASS__, 'options' ) ) )
+        {
+            $main = get_main_site_id();
+
+            if ( $main > 0 && current_user_can_for_blog( $main, 'manage_options' ) )
+            {
+                switch_to_blog( $main );
+                add_option( $option, $value );
+                restore_current_blog();
+            }
+        }
+    }
+
+    public static function update_option( $option, $old_value, $value )
+    {
+        if ( !is_main_site() && has_filter( 'pre_option_' . $option, array( __CLASS__, 'options' ) ) )
+        {
+            $main = get_main_site_id();
+
+            if ( $main > 0 && current_user_can_for_blog( $main, 'manage_options' ) )
+            {
+                switch_to_blog( $main );
+                update_option( $option, $value );
+                restore_current_blog();
+            }
+        }
+    }
+
     /**
      * Launch the initialization process.
@@ -64 +149 @@
     public function run()
     {
+        // Complete this before accessing the option on next line
+        add_filter( 'pre_option_supernetwork_options', array( __CLASS__, 'options' ), 10, 3 );
+        add_filter( 'pre_option_supernetwork_post_types', array( __CLASS__, 'options' ), 10, 3 );
+        add_filter( 'pre_option_supernetwork_consolidated', array( __CLASS__, 'options' ), 10, 3 );
+
+        foreach ( get_option( 'supernetwork_options', array() ) as $option => $val )
+        {
+            if ( $val && strpos( $option, '_' ) !== 0 && strpos( $option, 'supernetwork_' ) !== 0 )
+            {
+                add_filter( 'pre_option_' . $option, array( __CLASS__, 'options' ), 10, 3 );
+            }
+        }
+
+        add_filter( 'add_option', array( __CLASS__, 'add_option' ), 10, 2 );
+        add_filter( 'update_option', array( __CLASS__, 'update_option' ), 10, 3 );
+
+        // Disable querying of meta ID. See issue #10
+        add_filter( 'update_comment_metadata_by_mid', '__return_false' );
+        add_filter( 'update_post_metadata_by_mid', '__return_false' );
+        add_filter( 'update_term_metadata_by_mid', '__return_false' );
+        add_filter( 'delete_comment_metadata_by_mid', '__return_false' );
+        add_filter( 'delete_post_metadata_by_mid', '__return_false' );
+        add_filter( 'delete_term_metadata_by_mid', '__return_false' );
+
+        $this->network->register();
+
         // Load functions
-        add_filter( 'post_type_link', array( $this->network, 'intercept_permalink_for_post' ), 10, 2 );
-        add_filter( 'post_link', array( $this->network, 'intercept_permalink_for_post' ), 10, 2 );
-        add_filter( 'page_link', array( $this->network, 'intercept_permalink' ), 10, 2 );
-        add_filter( 'map_meta_cap', array( $this->network, 'intercept_capability_write' ), 10, 4 );
-        add_filter( 'user_has_cap', array( $this->network, 'intercept_capability_read' ), 10, 4 );
-        add_filter( 'pre_handle_404', array( $this->network, 'singular_access' ), 10, 2 );
-        add_filter( 'query', array( $this->network, 'intercept_query' ), 10, 2 );
-        add_filter( 'wp_insert_post', array( $this->network, 'shared_auto_increment' ), 10, 3 );
         add_filter( 'network_admin_menu', array( $this, 'summary' ) );
-
-        if ( is_main_site() ) $this->network->register_pages();
-
-        // Complete this before accessing the option on next line
-        add_filter( 'pre_option_supernetwork_options', array( $this, 'options' ), 10, 2 );
-        add_filter( 'pre_option_supernetwork_post_types', array( $this, 'options' ), 10, 2 );
-        add_filter( 'pre_option_supernetwork_consolidated', array( $this, 'options' ), 10, 2 );
-        
-        foreach ( (array) get_option( 'supernetwork_options' ) as $option => $val )
-        {
-            if ( $val && strpos( $option, '_' ) !== 0 && strpos( $option, 'supernetwork_' ) !== 0 )
-            {
-                add_filter( 'pre_option_' . $option, array( $this, 'options' ), 10, 2 );
-            }
-        }
-
-        $this->network->consolidated = !empty( get_option( 'supernetwork_consolidated' )['consolidated'] );
 
         if ( !$this->network->consolidated )
@@ -154 +240 @@
             if ( current_user_can( 'edit_post', $post->ID ) )
             {
-                if ( in_array( (string) $post->ID, $this->network->collisions, true ) )
+                $collisions = $this->network->collisions;
+
+                if ( array_intersect( get_comments( 'fields=ids&post_id=' . $post->ID ), $collisions['comments'] ) !== array() || in_array( (string) $post->ID, $collisions['posts'], true ) || array_intersect( wp_get_object_terms( $post->ID, array_keys( $GLOBALS['wp_taxonomies'] ), 'fields=tt_ids' ), $collisions['term_taxonomy'] ) !== array() || array_intersect( wp_get_object_terms( $post->ID, array_keys( $GLOBALS['wp_taxonomies'] ), 'fields=ids' ), $collisions['terms'] ) !== array() )
                 {
                     $actions['republish'] = '<i style="color: #888;">' . __( 'Can&apos;t Republish', 'supernetwork' ) . '</i>';

wp-super-network/trunk/wp-super-network.php

@@ -4 +4 @@
  * Plugin URI:
  * Description: Share content between sites and create offspring networks.
- * Version: 1.1.0
+ * Version: 1.2.0
  * Requires at least: 5.0
- * Requires PHP: 5.6
+ * Requires PHP: 7.2
  * Author: Ask Carlo
  * Author URI: https://askcarlo.com