From 5f30f1378032611d9a18bdc1f818296c3bd7bfc8 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Sun, 16 Nov 2014 06:11:22 +0000
Subject: [PATCH] Allow the response code to be passed as a shorthand to the
 `$title` or `$args` parameter of `wp_die()`, for brevity.

See #10551 and #11286
Props nacin

Built from https://develop.svn.wordpress.org/trunk@30355


git-svn-id: http://core.svn.wordpress.org/trunk@30354 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/functions.php | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 8ca5ca17de..a067452764 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2331,17 +2331,40 @@ function wp_nonce_ays( $action ) {
  *
  * This function complements the die() PHP function. The difference is that
  * HTML will be displayed to the user. It is recommended to use this function
- * only, when the execution should not continue any further. It is not
+ * only when the execution should not continue any further. It is not
  * recommended to call this function very often and try to handle as many errors
- * as possible silently.
+ * as possible silently or more gracefully.
+ *
+ * As a shorthand, the desired HTTP response code may be passed as an integer to
+ * the $title parameter (the default title would apply) or the $args parameter.
  *
  * @since 2.0.4
  *
- * @param string       $message Optional. Error message. Default empty.
- * @param string       $title   Optional. Error title. Default empty.
- * @param string|array $args    Optional. Arguments to control behavior. Default empty array.
+ * @param string|WP_Error  $message Optional. Error message. Default empty.
+ *                                  If this is a WP_Error object, the error's messages are used.
+ * @param string           $title   Optional. Error title. Default is a generic title.
+ *                                  If $message is a WP_Error object, error data with the key
+ *                                  'title' may be used to specify the title.
+ * @param string|array|int $args {
+ *     Optional. Arguments to control behavior. Default empty array.
+ *     If $args is an integer, then it is treated as the response code.
+ *
+ *     @type int    $response       The HTTP response code. Default 500.
+ *     @type bool   $back_link      Whether to include a link to go back. Default false.
+ *     @type string $text_direction The text direction. Defaults to the value of is_rtl().
+ *                                  Accepts 'rtl'. This is only useful internally, when WordPress
+ *                                  is still loading and the site's locale is not set up yet.
+ * }
  */
 function wp_die( $message = '', $title = '', $args = array() ) {
+
+	if ( is_int( $args ) ) {
+		$args = array( 'response' => $args );
+	} elseif ( is_int( $title ) ) {
+		$args  = array( 'response' => $title );
+		$title = '';
+	}
+
 	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
 		/**
 		 * Filter callback for killing WordPress execution for AJAX requests.