Changeset 42146 for trunk

Timestamp:

11/10/2017 10:29:45 PM (7 years ago)

Author:

westonruter

Message:

Settings: Replace count() call with empty() in get_settings_errors() to prevent PHP 7.2 warnings when $wp_settings_errors is null.

Props pross, dd32, westonruter.
See #40109.
Fixes #42498 for trunk.

Location:

trunk

Files:

• src/wp-admin/includes/template.php (modified) (1 diff)
• tests/phpunit/tests/option/sanitize-option.php (modified) (1 diff)

trunk/src/wp-admin/includes/template.php

@@ -1458 +1458 @@
 
     // Check global in case errors have been added on this pageload.
-    if ( ! count( $wp_settings_errors ) )
+    if ( empty( $wp_settings_errors ) ) {
         return array();
+    }
 
     // Filter the results to those of a specific setting if one was set.

trunk/tests/phpunit/tests/option/sanitize-option.php

@@ -158 +158 @@
         );
     }
+
+    /**
+     * Test calling get_settings_errors() with variations on where it gets errors from.
+     *
+     * @ticket 42498
+     * @covers get_settings_errors()
+     * @global array $wp_settings_errors
+     */
+    public function test_get_settings_errors_sources() {
+        global $wp_settings_errors;
+
+        $blogname_error = array(
+            'setting' => 'blogname',
+            'code'    => 'blogname',
+            'message' => 'Capital P dangit!',
+            'type'    => 'error',
+        );
+        $blogdescription_error = array(
+            'setting' => 'blogdescription',
+            'code'    => 'blogdescription',
+            'message' => 'Too short',
+            'type'    => 'error',
+        );
+
+        $wp_settings_errors = null;
+        $this->assertSame( array(), get_settings_errors( 'blogname' ) );
+
+        // Test getting errors from transient.
+        $_GET['settings-updated'] = '1';
+        set_transient( 'settings_errors', array( $blogname_error ) );
+        $wp_settings_errors = null;
+        $this->assertSame( array( $blogname_error ), get_settings_errors( 'blogname' ) );
+
+        // Test getting errors from transient and from global.
+        $_GET['settings-updated'] = '1';
+        set_transient( 'settings_errors', array( $blogname_error ) );
+        $wp_settings_errors = null;
+        add_settings_error( $blogdescription_error['setting'], $blogdescription_error['code'], $blogdescription_error['message'], $blogdescription_error['type'] );
+        $this->assertEqualSets( array( $blogname_error, $blogdescription_error ), get_settings_errors() );
+
+        $wp_settings_errors = null;
+    }
 }