Ticket #36827: 36827.2.diff

src/wp-includes/functions.php

@@ -6027 +6027 @@
 
                 // The request is for the admin.
                 if ( strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) !== false || strpos( $_SERVER['REQUEST_URI'], 'wp-login.php' ) !== false ) {
-                        $path = preg_replace( '#/(wp-admin/.*|wp-login.php)#i', '', $_SERVER['REQUEST_URI'] );
+                        $path = preg_replace( '#/(wp-admin/?.*|wp-login\.php.*)#i', '', $_SERVER['REQUEST_URI'] );
 
                         // The request is for a file in ABSPATH.
                 } elseif ( $script_filename_dir . '/' === $abspath_fix ) {

new file tests/phpunit/tests/functions/wpGuessUrl.php

@@ +1 @@
+<?php
+
+/**
+ * Test wp_guess_url().
+ *
+ * @group functions.php
+ * @covers ::wp_guess_url
+ */
+class Tests_Functions_wpGuessUrl extends WP_UnitTestCase {
+
+        /**
+         * @ticket 36827
+         *
+         * @dataProvider data_guess_url_should_return_site_url
+         *
+         * @param string $url The URL to navigate to, relative to `site_url()`.
+         */
+        public function test_guess_url_should_return_site_url( $url ) {
+                $siteurl = site_url();
+                $this->go_to( site_url( $url ) );
+                $this->assertSame( $siteurl, wp_guess_url() );
+        }
+
+        /**
+         * Data provider.
+         *
+         * @return array
+         */
+        function data_guess_url_should_return_site_url() {
+                return array(
+                        'no trailing slash'                            => array( 'url' => 'wp-admin' ),
+                        'trailing slash'                               => array( 'url' => 'wp-admin/' ),
+                        'trailing slash, query var'                    => array( 'url' => 'wp-admin/?foo=bar' ),
+                        'file extension, no trailing slash'            => array( 'url' => 'wp-login.php' ),
+                        'file extension, query var, no trailing slash' => array( 'url' => 'wp-login.php?foo=bar' ),
+                );
+        }
+}