Changeset 11290

Timestamp:

10/22/2021 05:55:54 AM (4 years ago)

Author:

dd32

Message:

Theme Directory: We really don't support pagination.

Avoids PHP Notices on pagination of pages.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php

@@ -52 +52 @@
 
     // We don't support pagination on the directory at present.
-    if ( get_query_var( 'paged' ) ) {
-        $url = remove_query_arg( 'paged' );
-        $url = preg_replace( '!page/\d+!i', '', $url );
+    if ( get_query_var( 'paged' ) || get_query_var( 'page' ) ) {
+        $url = remove_query_arg( [ 'paged', 'page' ] );
+        $url = preg_replace( '!(page/\d+|/\d+/?$)!i', '', $url );
 
         // Remove any double slashes