Ticket #60059: 60059.diff

src/wp-includes/canonical.php

@@ -316 +316 @@
                                         $redirect['query'] = remove_query_arg( 'year', $redirect['query'] );
                                 }
                         }
-                } elseif ( is_author() && ! empty( $_GET['author'] ) && preg_match( '|^[0-9]+$|', $_GET['author'] ) ) {
+                } elseif ( is_author() && ! empty( $_GET['author'] ) && is_string( $_GET['author'] ) && preg_match( '|^[0-9]+$|', $_GET['author'] ) ) {
                         $author = get_userdata( get_query_var( 'author' ) );
 
                         if ( false !== $author

tests/phpunit/tests/canonical.php

@@ -206 +206 @@
                         array( '/?author=%d', '/author/canonical-author/' ),
                         // array( '/?author=%d&year=2008', '/2008/?author=3'),
                         // array( '/author/canonical-author/?year=2008', '/2008/?author=3'), // Either or, see previous testcase.
+                        array( '/author/canonical-author/?author[1]=hello', '/author/canonical-author/?author[1]=hello' ),
 
                         // Feeds.
                         array( '/?feed=atom', '/feed/atom/' ),