Changeset 19875

Timestamp:

02/08/2012 05:08:13 PM (13 years ago)

Author:

nacin

Message:

When WordPress is in a subdirectory (home URL != site URL), let home/wp-admin and home/wp-login.php redirect to their proper locations. props greuben for initial patch, fixes #19607.

File:

• trunk/wp-includes/canonical.php (modified) (1 diff)

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( 'url' ) ) {
+            if ( $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' );
         }