Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 18 insertions, 1 deletions

diff --git a/includes/WebResponse.php b/includes/WebResponse.php
index ab34931c..1b6947cd 100644
--- a/includes/WebResponse.php
+++ b/includes/WebResponse.php
@@ -28,7 +28,7 @@
 class WebResponse {
 
 	/**
-	 * Output a HTTP header, wrapper for PHP's header()
+	 * Output an HTTP header, wrapper for PHP's header()
 	 * @param string $string Header to output
 	 * @param bool $replace Replace current similar header
 	 * @param null|int $http_response_code Forces the HTTP response code to the specified value.
@@ -54,6 +54,15 @@ class WebResponse {
 	}
 
 	/**
+	 * Output an HTTP status code header
+	 * @since 1.26
+	 * @param int $code Status code
+	 */
+	public function statusHeader( $code ) {
+		HttpStatus::header( $code );
+	}
+
+	/**
 	 * Set the browser cookie
 	 * @param string $name The name of the cookie.
 	 * @param string $value The value to be stored in the cookie.
@@ -163,6 +172,14 @@ class FauxResponse extends WebResponse {
 	}
 
 	/**
+	 * @since 1.26
+	 * @param int $code Status code
+	 */
+	public function statusHeader( $code ) {
+		$this->code = intval( $code );
+	}
+
+	/**
 	 * @param string $key The name of the header to get (case insensitive).
 	 * @return string|null The header value (if set); null otherwise.
 	 */