Account for display_errors being stderr

westonruter · dmsnell · westonruter · commit 5b13a71d53f4 · 2025-11-01T20:03:27.000-07:00
Co-authored-by: Dennis Snell &lt;dmsnell@git.wordpress.org&gt;
diff --git a/src/wp-includes/template.php b/src/wp-includes/template.php
@@ -987,8 +987,8 @@ static function ( int $level, string $message, ?string $file = null, ?int $line
 			return false;
 		}
 	);
-	$display_errors = ini_get( 'display_errors' );
-	if ( $display_errors ) {
+	$original_display_errors = ini_get( 'display_errors' );
+	if ( $original_display_errors ) {
 		ini_set( 'display_errors', 0 );
 	}
 
@@ -1071,7 +1071,7 @@ static function ( int $level, string $message, ?string $file = null, ?int $line
 	}
 
 	// Append any errors to be displayed before returning flushing the buffer.
-	if ( $display_errors ) {
+	if ( $original_display_errors && 'stderr' !== $original_display_errors ) {
 		foreach ( $error_log as $error ) {
 			switch ( $error['level'] ) {
 				case E_USER_NOTICE:
@@ -1100,7 +1100,7 @@ static function ( int $level, string $message, ?string $file = null, ?int $line
 			$filtered_output .= sprintf( $format, ini_get( 'error_prepend_string' ), $type, $error['message'], $error['file'], $error['line'], ini_get( 'error_append_string' ) );
 		}
 
-		ini_set( 'display_errors', 1 );
+		ini_set( 'display_errors', $original_display_errors );
 	}
 
 	restore_error_handler();

Original file line number	Diff line number	Diff line change
`@@ -987,8 +987,8 @@ static function ( int $level, string $message, ?string $file = null, ?int $line`
`987`	`987`	`return false;`
`988`	`988`	`}`
`989`	`989`	`);`
`990`		`- $display_errors = ini_get( 'display_errors' );`
`991`		`- if ( $display_errors ) {`
	`990`	`+ $original_display_errors = ini_get( 'display_errors' );`
	`991`	`+ if ( $original_display_errors ) {`
`992`	`992`	`ini_set( 'display_errors', 0 );`
`993`	`993`	`}`
`994`	`994`
`@@ -1071,7 +1071,7 @@ static function ( int $level, string $message, ?string $file = null, ?int $line`
`1071`	`1071`	`}`
`1072`	`1072`
`1073`	`1073`	`// Append any errors to be displayed before returning flushing the buffer.`
`1074`		`- if ( $display_errors ) {`
	`1074`	`+ if ( $original_display_errors && 'stderr' !== $original_display_errors ) {`
`1075`	`1075`	`foreach ( $error_log as $error ) {`
`1076`	`1076`	`switch ( $error['level'] ) {`
`1077`	`1077`	`case E_USER_NOTICE:`
`@@ -1100,7 +1100,7 @@ static function ( int $level, string $message, ?string $file = null, ?int $line`
`1100`	`1100`	`$filtered_output .= sprintf( $format, ini_get( 'error_prepend_string' ), $type, $error['message'], $error['file'], $error['line'], ini_get( 'error_append_string' ) );`
`1101`	`1101`	`}`
`1102`	`1102`
`1103`		`- ini_set( 'display_errors', 1 );`
	`1103`	`+ ini_set( 'display_errors', $original_display_errors );`
`1104`	`1104`	`}`
`1105`	`1105`
`1106`	`1106`	`restore_error_handler();`