Changeset 45611 for trunk/src/wp-includes/class-wp.php

Timestamp:

07/09/2019 05:44:42 AM (7 years ago)

Author:

pento

Message:

Coding Standards: Fix instances of WordPress.PHP.NoSilencedErrors.Discouraged.

Noteable changes:

• The magic_quotes_runtime and magic_quotes_sybase settings were removed in PHP 5.4, so no longer need to be set.
• Some functions that use external libraries can generate errors that can't be tested for, so are globally allowed to silence errors.
• Quite a few functions would cause errors if safe_mode was set. This setting was removed in PHP 5.4.
• Only a handful of header() calls needed corresponding headers_sent() checks for unit tests to pass, but more may need to be added as the nightlies builds are tested.

See #46732.

File:

• trunk/src/wp-includes/class-wp.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp.php

@@ -493 +493 @@
                         unset( $headers['Last-Modified'] );
 
-                        // In PHP 5.3+, make sure we are not sending a Last-Modified header.
-                        if ( function_exists( 'header_remove' ) ) {
-                                @header_remove( 'Last-Modified' );
-                        } else {
-                                // In PHP 5.2, send an empty Last-Modified header, but only as a
-                                // last resort to override a header already sent. #WP23021
-                                foreach ( headers_list() as $header ) {
-                                        if ( 0 === stripos( $header, 'Last-Modified' ) ) {
-                                                $headers['Last-Modified'] = '';
-                                                break;
-                                        }
-                                }
-                        }
-                }
-
-                foreach ( (array) $headers as $name => $field_value ) {
-                        @header( "{$name}: {$field_value}" );
+                        if ( ! headers_sent() ) {
+                                header_remove( 'Last-Modified' );
+                        }
+                }
+
+                if ( ! headers_sent() ) {
+                        foreach ( (array) $headers as $name => $field_value ) {
+                                header( "{$name}: {$field_value}" );
+                        }
                 }
 
@@ -675 +667 @@
 
                                 // Only set X-Pingback for single posts that allow pings.
-                                if ( $p && pings_open( $p ) ) {
-                                        @header( 'X-Pingback: ' . get_bloginfo( 'pingback_url', 'display' ) );
+                                if ( $p && pings_open( $p ) && ! headers_sent() ) {
+                                        header( 'X-Pingback: ' . get_bloginfo( 'pingback_url', 'display' ) );
                                 }