Changeset 19880

Timestamp:

02/08/2012 08:11:52 PM (14 years ago)

Author:

nacin

Message:

In case of 404, redirect /login, /dashboard, /admin to corresponding WP equivalents. fixes #19607.

File:

• trunk/wp-includes/canonical.php (modified) (2 diffs)

trunk/wp-includes/canonical.php

@@ -91 +91 @@
                                 $redirect['query'] = remove_query_arg(array('p', 'page_id', 'attachment_id', 'post_type'), $redirect['query']);
                         }
-                }
-
-                if ( ! $redirect_url && get_option( 'home' ) != get_option( 'siteurl' ) ) {
-                        if ( trailingslashit( $original['path'] ) == home_url( 'wp-admin/', 'relative' ) )
-                                $redirect_url = admin_url();
-                        elseif ( $original['path'] == home_url( 'wp-login.php', 'relative' ) )
-                                $redirect_url = site_url( 'wp-login.php', 'login' );
                 }
 
@@ -473 +466 @@
 
 add_action('template_redirect', 'redirect_canonical');
+
+function wp_redirect_admin_locations() {
+        global $wp_rewrite;
+        if ( ! ( is_404() && $wp_rewrite->using_permalinks() ) )
+                return;
+
+        $admins = array(
+                home_url( 'wp-admin', 'relative' ),
+                home_url( 'dashboard', 'relative' ),
+                home_url( 'admin', 'relative' ),
+                site_url( 'dashboard', 'relative' ),
+                site_url( 'admin', 'relative' ),
+        );
+        if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $admins ) ) {
+                wp_redirect( admin_url() );
+                exit;
+        }
+
+        $logins = array(
+                home_url( 'wp-login.php', 'relative' ),
+                home_url( 'login', 'relative' ),
+                site_url( 'login', 'relative' ),
+        );
+        if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $logins ) ) {
+                wp_redirect( site_url( 'wp-login.php', 'login' ) );
+                exit;
+        }
+}
+
+add_action( 'template_redirect', 'wp_redirect_admin_locations', 1000 );