Changeset 50163

Timestamp:

02/02/2021 08:32:42 PM (6 years ago)

Author:

whyisjake

Message:

Administration: New filter ahead of the months drop-down.

As this can cause large, long running queries on sites with many posts, this filter allows the query to be modified, bypassing entirely if needed.

Fixes #51660.

Props geoffguillain, SergeyBiryukov, hareesh-pillai, hellofromTonya, TimothyBlynJacobs, whyisjake.

Location:

trunk

Files:

• package-lock.json (modified) (7 diffs)
• src/wp-admin/includes/class-wp-list-table.php (modified) (1 diff)

trunk/package-lock.json

@@ -3922 +3922 @@
                                                 "unbzip2-stream": "^1.3.3",
                                                 "ws": "^7.2.3"
-                                        },
-                                        "dependencies": {
-                                                "devtools-protocol": {
-                                                        "version": "0.0.818844",
-                                                        "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz",
-                                                        "integrity": "sha512-AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg==",
-                                                        "dev": true
-                                                }
                                         }
                                 },
@@ -7197 +7189 @@
                 "create-hash": {
                         "version": "1.2.0",
-                        "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+                        "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
                         "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
                         "dev": true,
@@ -7210 +7202 @@
                 "create-hmac": {
                         "version": "1.1.7",
-                        "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+                        "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
                         "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
                         "dev": true,
@@ -7295 +7287 @@
                 "css-color-names": {
                         "version": "0.0.4",
-                        "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+                        "resolved": "http://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
                         "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
                         "dev": true
@@ -8057 +8049 @@
                         "dev": true
                 },
+                "devtools-protocol": {
+                        "version": "0.0.818844",
+                        "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz",
+                        "integrity": "sha512-AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg==",
+                        "dev": true
+                },
                 "diff": {
                         "version": "4.0.2",
@@ -8070 +8068 @@
                 "diffie-hellman": {
                         "version": "5.0.3",
-                        "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+                        "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
                         "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
                         "dev": true,
@@ -20374 +20372 @@
                 "sha.js": {
                         "version": "2.4.11",
-                        "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+                        "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
                         "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
                         "dev": true,

trunk/src/wp-admin/includes/class-wp-list-table.php

@@ -596 +596 @@
                 }
 
-                $extra_checks = "AND post_status != 'auto-draft'";
-                if ( ! isset( $_GET['post_status'] ) || 'trash' !== $_GET['post_status'] ) {
-                        $extra_checks .= " AND post_status != 'trash'";
-                } elseif ( isset( $_GET['post_status'] ) ) {
-                        $extra_checks = $wpdb->prepare( ' AND post_status = %s', $_GET['post_status'] );
-                }
-
-                $months = $wpdb->get_results(
-                        $wpdb->prepare(
-                                "
-                        SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
-                        FROM $wpdb->posts
-                        WHERE post_type = %s
-                        $extra_checks
-                        ORDER BY post_date DESC
-                ",
-                                $post_type
-                        )
-                );
-
                 /**
-                 * Filters the 'Months' drop-down results.
+                 * Filters to short-circuit performing the months dropdown query.
                  *
-                 * @since 3.7.0
+                 * @since 5.7.0
                  *
-                 * @param object[] $months    Array of the months drop-down query results.
-                 * @param string   $post_type The post type.
+                 * @param object[]|false $months   'Months' drop-down results. Default false.
+                 * @param string         $post_type The post type.
                  */
-                $months = apply_filters( 'months_dropdown_results', $months, $post_type );
+                $months = apply_filters( 'pre_months_dropdown_query', false, $post_type );
+
+                if ( ! is_array( $months ) ) {
+                        $extra_checks = "AND post_status != 'auto-draft'";
+                        if ( ! isset( $_GET['post_status'] ) || 'trash' !== $_GET['post_status'] ) {
+                                $extra_checks .= " AND post_status != 'trash'";
+                        } elseif ( isset( $_GET['post_status'] ) ) {
+                                $extra_checks = $wpdb->prepare( ' AND post_status = %s', $_GET['post_status'] );
+                        }
+
+                        $months = $wpdb->get_results(
+                                $wpdb->prepare(
+                                        "
+                                SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
+                                FROM $wpdb->posts
+                                WHERE post_type = %s
+                                $extra_checks
+                                ORDER BY post_date DESC
+                        ",
+                                        $post_type
+                                )
+                        );
+
+                        /**
+                         * Filters the 'Months' drop-down results.
+                         *
+                         * @since 3.7.0
+                         *
+                         * @param object[] $months    Array of the months drop-down query results.
+                         * @param string   $post_type The post type.
+                         */
+                        $months = apply_filters( 'months_dropdown_results', $months, $post_type );
+                }
 
                 $month_count = count( $months );