Changeset 58139

Timestamp:

05/13/2024 03:22:07 PM (3 months ago)

Author:

johnbillion

Message:

Bootstrap/Load: Place the debugging output for automatic plugin and theme updates behind a debugging flag.

This change means this debugging output will only be shown when both the WP_DEBUG and WP_DEBUG_LOG constants are defined as true.

Props costdev, afragen, swissspidy

Fixes #58281

File:

• trunk/src/wp-admin/includes/class-wp-automatic-updater.php (modified) (10 diffs)

trunk/src/wp-admin/includes/class-wp-automatic-updater.php

@@ -447 +447 @@
         }
 
+
         if ( 'plugin' === $type ) {
             $was_active = is_plugin_active( $upgrader_item );
-            error_log( '    Upgrading plugin ' . var_export( $item->slug, true ) . '...' );
-        }
-
-        if ( 'theme' === $type ) {
+            if ( $is_debug ) {
+                error_log( '    Upgrading plugin ' . var_export( $item->slug, true ) . '...' );
+            }
+        }
+
+        if ( 'theme' === $type && $is_debug ) {
             error_log( '    Upgrading theme ' . var_export( $item->theme, true ) . '...' );
         }
@@ -521 +524 @@
         }
 
-        if ( 'theme' === $type ) {
+        $is_debug = WP_DEBUG && WP_DEBUG_LOG;
+
+        if ( 'theme' === $type && $is_debug ) {
             error_log( '    Theme ' . var_export( $item->theme, true ) . ' has been upgraded.' );
         }
 
         if ( 'plugin' === $type ) {
-            error_log( '    Plugin ' . var_export( $item->slug, true ) . ' has been upgraded.' );
-            if ( is_plugin_inactive( $upgrader_item ) ) {
-                error_log( '    ' . var_export( $upgrader_item, true ) . ' is inactive and will not be checked for fatal errors.' );
+            if ( $is_debug ) {
+                error_log( '    Plugin ' . var_export( $item->slug, true ) . ' has been upgraded.' );
+                if ( is_plugin_inactive( $upgrader_item ) ) {
+                    error_log( '    ' . var_export( $upgrader_item, true ) . ' is inactive and will not be checked for fatal errors.' );
+                }
             }
 
@@ -597 +604 @@
                      * appear above this entry in the log file.
                      */
-                    error_log( '    ' . implode( "\n", $upgrade_result->get_error_messages() ) );
-                } else {
+                    if ( $is_debug ) {
+                        error_log( '    ' . implode( "\n", $upgrade_result->get_error_messages() ) );
+                    }
+                } elseif ( $is_debug ) {
                     error_log( '    The update for ' . var_export( $item->slug, true ) . ' has no fatal errors.' );
                 }
@@ -635 +644 @@
         }
 
-        error_log( 'Automatic updates starting...' );
+        $is_debug = WP_DEBUG && WP_DEBUG_DISPLAY;
+
+        if ( $is_debug ) {
+            error_log( 'Automatic updates starting...' );
+        }
 
         // Don't automatically run these things, as we'll handle it ourselves.
@@ -647 +660 @@
         $plugin_updates = get_site_transient( 'update_plugins' );
         if ( $plugin_updates && ! empty( $plugin_updates->response ) ) {
-            error_log( '  Automatic plugin updates starting...' );
+            if ( $is_debug ) {
+                error_log( '  Automatic plugin updates starting...' );
+            }
 
             foreach ( $plugin_updates->response as $plugin ) {
@@ -656 +671 @@
             wp_clean_plugins_cache();
 
-            error_log( '  Automatic plugin updates complete.' );
+            if ( $is_debug ) {
+                error_log( '  Automatic plugin updates complete.' );
+            }
         }
 
@@ -663 +680 @@
         $theme_updates = get_site_transient( 'update_themes' );
         if ( $theme_updates && ! empty( $theme_updates->response ) ) {
-            error_log( '  Automatic theme updates starting...' );
+            if ( $is_debug ) {
+                error_log( '  Automatic theme updates starting...' );
+            }
 
             foreach ( $theme_updates->response as $theme ) {
@@ -671 +690 @@
             wp_clean_themes_cache();
 
-            error_log( '  Automatic theme updates complete.' );
-        }
-
-        error_log( 'Automatic updates complete.' );
+            if ( $is_debug ) {
+                error_log( '  Automatic theme updates complete.' );
+            }
+        }
+
+        if ( $is_debug ) {
+            error_log( 'Automatic updates complete.' );
+        }
 
         // Next, process any core update.
@@ -1735 +1758 @@
         $timeout = 50; // 50 seconds.
 
-        error_log( '    Scraping home page...' );
+        $is_debug = WP_DEBUG && WP_DEBUG_DISPLAY;
+        if ( $is_debug ) {
+            error_log( '    Scraping home page...' );
+        }
 
         $needle_start = "###### wp_scraping_result_start:$scrape_key ######";
@@ -1743 +1769 @@
 
         if ( is_wp_error( $response ) ) {
-            error_log( 'Loopback request failed: ' . $response->get_error_message() );
+            if ( $is_debug ) {
+                error_log( 'Loopback request failed: ' . $response->get_error_message() );
+            }
             return true;
         }
 
         // If this outputs `true` in the log, it means there were no fatal errors detected.
-        error_log( var_export( substr( $response['body'], strpos( $response['body'], '###### wp_scraping_result_start:' ) ), true ) );
+        if ( $is_debug ) {
+            error_log( var_export( substr( $response['body'], strpos( $response['body'], '###### wp_scraping_result_start:' ) ), true ) );
+        }
 
         $body                   = wp_remote_retrieve_body( $response );