Changeset 5206

Timestamp:

03/30/2017 07:28:30 AM (8 years ago)

Author:

dd32

Message:

Plugin Directory: Rearrange the rewrite rules to allow access to /search/admin, and remove the wp-admin auto-redirect on /admin$ 404 requests.

Fixes #2625.

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

@@ -436 +436 @@
         add_rewrite_rule( '^browse/favorites/([^/]+)$', 'index.php?browse=favorites&favorites_user=$matches[1]', 'top' );
 
+        // Add duplicate search rule which will be hit before the following old-plugin tab rules
+        add_rewrite_rule( '^search/([^/]+)/?$', 'index.php?s=$matches[1]', 'top' );
+
         // Handle plugin admin requests
         add_rewrite_rule( '^([^/]+)/admin/?$', 'index.php?name=$matches[1]&plugin_admin=1', 'top' );
 
-        // Add duplicate search rule which will be hit before the following old-plugin tab rules
-        add_rewrite_rule( '^search/([^/]+)/?$', 'index.php?s=$matches[1]', 'top' );
-
         // Handle the old plugin tabs URLs.
         add_rewrite_rule( '^([^/]+)/(installation|faq|screenshots|changelog|stats|developers|other_notes)/?$', 'index.php?redirect_plugin=$matches[1]&redirect_plugin_tab=$matches[2]', 'top' );
@@ -447 +447 @@
         // If changing capabilities around, uncomment this.
         //Capabilities::add_roles();
+
+        // Remvoe the /admin$ redirect to wp-admin
+        remove_action( 'template_redirect', 'wp_redirect_admin_locations', 1000 );
 
         // When this plugin is used in the context of a Rosetta site, handle it gracefully.