Changeset 5316

Timestamp:

04/11/2017 04:28:33 AM (8 years ago)

Author:

dd32

Message:

Plugin Directory: The plugin post_type's post_modified date should only ever be changed in response to a SVN action, and not just because wp_update_post() was called.
This moves the code responsible for handling this special case from the plugin importer to globally affecting the site.

See #2605

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• class-plugin-directory.php (modified) (2 diffs)
• cli/class-import.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php

@@ -57 +57 @@
         add_action( 'rest_api_init', array( __NAMESPACE__ . '\API\Base', 'load_routes' ) );
 
+        // Allow post_modified not to be modified when we don't specifically bump it.
+        add_filter( 'wp_insert_post_data', array( $this, 'filter_wp_insert_post_data' ), 10, 2 );
+
         // Work around caching issues
         add_filter( 'pre_option_jetpack_sync_full__started' , array( $this, 'bypass_options_cache' ), 10, 2 );
@@ -84 +87 @@
         register_activation_hook( PLUGIN_FILE, array( $this, 'activate' ) );
         register_deactivation_hook( PLUGIN_FILE, array( $this, 'deactivate' ) );
+    }
+
+    /**
+     * Filters `wp_insert_post()` to respect the presented data.
+     * This function overrides `wp_insert_post()`s constant updating of
+     * the post_modified fields.
+     *
+     * @param array $data    The data to be inserted into the database.
+     * @param array $postarr The raw data passed to `wp_insert_post()`.
+     *
+     * @return array The data to insert into the database.
+     */
+    public function filter_wp_insert_post_data( $data, $postarr ) {
+        if ( 'plugin' === $postarr['post_type'] ) {
+            $data['post_modified']     = $postarr['post_modified'];
+            $data['post_modified_gmt'] = $postarr['post_modified_gmt'];
+        }
+        return $data;
     }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php

@@ -94 +94 @@
         }
 
-        add_filter( 'wp_insert_post_data', array( $this, 'filter_wp_insert_post_data' ), 10, 2 );
         wp_update_post( $plugin );
-        remove_filter( 'wp_insert_post_data', array( $this, 'filter_wp_insert_post_data' ) );
 
         // Set categories if there aren't any yet. wp-admin takes precedent.
@@ -379 +377 @@
 
     /**
-     * Filters `wp_insert_post()` to respect the presented data.
-     * This function overrides `wp_insert_post()`s constant updating of
-     * the post_modified fields.
-     *
-     * @param array $data    The data to be inserted into the database.
-     * @param array $postarr The raw data passed to `wp_insert_post()`.
-     *
-     * @return array The data to insert into the database.
-     */
-    public function filter_wp_insert_post_data( $data, $postarr ) {
-        if ( 'plugin' === $postarr['post_type'] ) {
-            $data['post_modified']     = $postarr['post_modified'];
-            $data['post_modified_gmt'] = $postarr['post_modified_gmt'];
-        }
-        return $data;
-    }
-
-    /**
      * Find the plugin readme file.
      *