Changeset 47762

Timestamp:

05/05/2020 06:56:44 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Site Health: Display the original PHP memory limit on Site Health Info screen.

This ensures that if the limit has been modified for admin screens by wp_raise_memory_limit(), the original value is displayed along with the current value.

Props Clorith, espiat, zodiac1978, SergeyBiryukov.
Fixes #49329.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-debug-data.php (modified) (1 diff)
• class-wp-site-health.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-debug-data.php

@@ -648 +648 @@
                                 'value' => ini_get( 'max_execution_time' ),
                         );
-                        $info['wp-server']['fields']['memory_limit']        = array(
-                                'label' => __( 'PHP memory limit' ),
-                                'value' => ini_get( 'memory_limit' ),
-                        );
-                        $info['wp-server']['fields']['max_input_time']      = array(
+
+                        if ( WP_Site_Health::get_instance()->php_memory_limit !== ini_get( 'memory_limit' ) ) {
+                                $info['wp-server']['fields']['memory_limit']       = array(
+                                        'label' => __( 'PHP memory limit' ),
+                                        'value' => WP_Site_Health::get_instance()->php_memory_limit,
+                                );
+                                $info['wp-server']['fields']['admin_memory_limit'] = array(
+                                        'label' => __( 'PHP memory limit (only for admin screens)' ),
+                                        'value' => ini_get( 'memory_limit' ),
+                                );
+                        } else {
+                                $info['wp-server']['fields']['memory_limit'] = array(
+                                        'label' => __( 'PHP memory limit' ),
+                                        'value' => ini_get( 'memory_limit' ),
+                                );
+                        }
+
+                        $info['wp-server']['fields']['max_input_time']    = array(
                                 'label' => __( 'Max input time' ),
                                 'value' => ini_get( 'max_input_time' ),
                         );
-                        $info['wp-server']['fields']['upload_max_size']     = array(
+                        $info['wp-server']['fields']['upload_max_size']   = array(
                                 'label' => __( 'Upload max filesize' ),
                                 'value' => ini_get( 'upload_max_filesize' ),
                         );
-                        $info['wp-server']['fields']['php_post_max_size']   = array(
+                        $info['wp-server']['fields']['php_post_max_size'] = array(
                                 'label' => __( 'PHP post max size' ),
                                 'value' => ini_get( 'post_max_size' ),

trunk/src/wp-admin/includes/class-wp-site-health.php

@@ -19 +19 @@
         private $health_check_mysql_rec_version      = '';
 
+        public $php_memory_limit;
+
         public $schedules;
         public $crons;
@@ -33 +35 @@
         public function __construct() {
                 $this->maybe_create_scheduled_event();
+
+                // Save memory limit before it's affected by wp_raise_memory_limit( 'admin' ).
+                $this->php_memory_limit = ini_get( 'memory_limit' );
 
                 $this->timeout_late_cron   = 0;