Changeset 10801

Timestamp:

03/10/2021 05:21:46 AM (5 years ago)

Author:

dd32

Message:

Plugin Directory: Allow Plugin_Directory::get_plugin_post() to rely upon the global $post object when..

• It's a plugin post_type, and the slug matches the requested slug,
• It's a plugin post_type, be called with a 0 / null slug input, assume the global plugin post object.

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

@@ -1682 +1682 @@
          * @return \WP_Post|bool
          */
-        public static function get_plugin_post( $plugin_slug ) {
+        public static function get_plugin_post( $plugin_slug = null ) {
                 global $post;
 
@@ -1699 +1699 @@
                 }
 
-                // Use the global $post object when it matches to avoid hitting the database.
-                if ( ! empty( $post ) && 'plugin' == $post->post_type && $plugin_slug == $post->post_name ) {
-                        return $post;
+                // Use the global $post object when appropriate
+                if ( ! empty( $post ) && 'plugin' == $post->post_type ) {
+                        // Default to the global object.
+                        if ( is_null( $plugin_slug ) || 0 === $plugin_slug ) {
+                                return get_post( $post->ID );
+                        }
+
+                        // Avoid hitting the database if it matches.
+                        if ( $plugin_slug == $post->post_name ) {
+                                return get_post( $post->ID );
+                        }
                 }
 
                 $plugin_slug = sanitize_title_for_query( $plugin_slug );
-
-                if ( false !== ( $post_id = wp_cache_get( $plugin_slug, 'plugin-slugs' ) ) && ( $post = get_post( $post_id ) ) ) {
-                        // We have a $post.
-                } else {
-
+                if ( ! $plugin_slug ) {
+                        return false;
+                }
+
+                $post    = false;
+                $post_id = wp_cache_get( $plugin_slug, 'plugin-slugs' );
+                if ( 0 === $post_id ) {
+                        // Unknown plugin slug.
+                        return false;
+                } else if ( $post_id ) {
+                        $post = get_post( $post_id );
+                }
+
+                if ( ! $post ) {
                         // get_post_by_slug();
                         $posts = get_posts( array(