Changeset 3408

Timestamp:

06/17/2016 11:44:08 AM (9 years ago)

Author:

obenland

Message:

Plugin Directory: Combine 404 redirect checks.

Fixes a bug where disabled plugins would cause a redirect loop for logged-out
users.

See [3377].

File:

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

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

@@ -30 +30 @@
         add_filter( 'rest_api_allowed_post_types', array( $this, 'filter_allowed_post_types' ) );
         add_filter( 'pre_update_option_jetpack_options', array( $this, 'filter_jetpack_options' ) );
-        add_action( 'template_redirect', array( $this, 'redirect_hidden_plugins' ) );
         add_action( 'template_redirect', array( $this, 'prevent_canonical_for_plugins' ), 9 );
         add_action( 'template_redirect', array( $this, 'redirect_old_plugin_urls' ) );
@@ -547 +546 @@
 
     /**
-     * Redirects Committers and Admins to a plugin's edit page if it's disabled or closed.
-     */
-    public function redirect_hidden_plugins() {
-        if ( ! is_404() ) {
-            return;
-        }
-
-        $post = self::get_plugin_post( get_query_var( 'name', false ) );
-
-        if ( $post instanceof \WP_Post && in_array( $post->post_status, array( 'disabled', 'closed' ), true ) && current_user_can( 'edit_post', $post ) ) {
-            wp_safe_redirect( add_query_arg( array( 'post' => $post->ID, 'action' => 'edit' ), admin_url( 'post.php' ) ) );
-            die();
-        }
-    }
-
-    /**
      * Prevents Canonical redirecting to other plugins on 404's.
      */
@@ -580 +563 @@
             die();
         }
-
         // We don't have attachments, but /$plugin/random() will hit this check.
         if ( is_404() ) {
+
             // [1] => plugins [2] => example-plugin-name [2..] => random()
             $plugin_slug = explode( '/', $_SERVER['REQUEST_URI'] )[2];
+
             if ( $plugin = self::get_plugin_post( $plugin_slug ) ) {
-                wp_safe_redirect( get_permalink( $plugin->ID ) );
-                die();
+                $is_disabled = in_array( $plugin->post_status, array( 'disabled', 'closed' ), true );
+
+                if ( $is_disabled && current_user_can( 'edit_post', $plugin ) ) {
+                    wp_safe_redirect( add_query_arg( array( 'post' => $plugin->ID, 'action' => 'edit' ), admin_url( 'post.php' ) ) );
+                    die();
+                } else if ( ! $is_disabled ) {
+                    wp_safe_redirect( get_permalink( $plugin->ID ) );
+                    die();
+                }
             }
         }