Ticket #22705: 22705.2.diff

wp-includes/ms-default-constants.php

@@ -63 +63 @@
          * @since 2.6.0
          */
         if ( !defined( 'ADMIN_COOKIE_PATH' ) ) {
-                if( !is_subdomain_install() ) {
+                if ( ! is_subdomain_install() || trim( parse_url( get_option( 'siteurl' ), PHP_URL_PATH ), '/' ) ) {
                         define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH );
                 } else {
                         define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );