Ticket #34397: 34397.diff

src/wp-includes/load.php

@@ -88 +88 @@
                         }
 
                         // Append the query string if it exists and isn't null
-                        if ( ! empty( $_SERVER['QUERY_STRING'] ) ) {
+                        if ( ! empty( $_SERVER['QUERY_STRING'] ) && ! parse_url( $_SERVER['REQUEST_URI'], PHP_URL_QUERY ) ) {
                                 $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
                         }
                 }