Changeset 10802

Timestamp:

03/10/2021 05:34:15 AM (3 years ago)

Author:

dd32

Message:

Plugin Directory: Don't overwrite the global $post object in Plugin_Directory::get_plugin_post().

It's not clear why this function was overriding the global $post object sometimes (not always) and could set it to invalid data.

Follow up to [10801].

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php (modified) (2 diffs)

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

@@ -1683 +1683 @@
      */
     public static function get_plugin_post( $plugin_slug = null ) {
-        global $post;
-
         if ( $plugin_slug instanceof \WP_Post ) {
             return $plugin_slug;
@@ -1692 +1690 @@
         if (
             is_int( $plugin_slug ) &&
-            ( $post_obj = get_post( $plugin_slug ) ) &&
-            ( $post_obj->ID === $plugin_slug )
+            ( $post = get_post( $plugin_slug ) ) &&
+            ( $post->ID === $plugin_slug )
         ) {
-            $post = $post_obj;
-            return $post_obj;
+            return $post;
         }
 
         // Use the global $post object when appropriate
-        if ( ! empty( $post ) && 'plugin' == $post->post_type ) {
+        if (
+            ! empty( $GLOBALS['post']->post_type ) &&
+            'plugin' === $GLOBALS['post']->post_type
+        ) {
             // Default to the global object.
             if ( is_null( $plugin_slug ) || 0 === $plugin_slug ) {
-                return get_post( $post->ID );
+                return get_post( $->ID );
             }
 
             // Avoid hitting the database if it matches.
-            if ( $plugin_slug == $post->post_name ) {
-                return get_post( $post->ID );
+            if ( $plugin_slug == $->post_name ) {
+                return get_post( $->ID );
             }
         }