conflict remove

Mdsujansarkar · Mdsujansarkar · commit 86eaf72fcda9 · 2025-11-03T11:32:34.000+06:00
diff --git a/src/wp-includes/rest-api/class-wp-rest-server.php b/src/wp-includes/rest-api/class-wp-rest-server.php
@@ -226,7 +226,7 @@ protected function error_to_response( $error ) {
 	 *
 	 * @param string $code    WP_Error-style code.
 	 * @param string $message Human-readable message.
-	 * @param int    $status  Optional. HTTP status code to send. Default null.
+	 * @param int|null $status  Optional. HTTP status code to send. Default null.
 	 * @return string JSON representation of the error.
 	 */
 	protected function json_error( $code, $message, $status = null ) {

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ protected function error_to_response( $error ) {`
`226`	`226`	`*`
`227`	`227`	`* @param string $code WP_Error-style code.`
`228`	`228`	`* @param string $message Human-readable message.`
`229`		`- * @param int $status Optional. HTTP status code to send. Default null.`
	`229`	`+ * @param int\|null $status Optional. HTTP status code to send. Default null.`
`230`	`230`	`* @return string JSON representation of the error.`
`231`	`231`	`*/`
`232`	`232`	`protected function json_error( $code, $message, $status = null ) {`