From: saper <saper@saper.info>
Date: Fri, 23 Sep 2016 20:07:31 +0000 (+0200)
Subject: action=history should return 404 if there is no such page
X-Git-Tag: 1.31.0-rc.0~5237^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/journal.php?a=commitdiff_plain;h=3aed5acec14fb73a50b8eeaa1f08695e6e1757e5;p=lhc%2Fweb%2Fwiklou.git

action=history should return 404 if there is no such page

Respects $wgSend404Code if configured.

Bug: T146496
Change-Id: I158aae3633db56d432f772ee0aa22c39fd6dc7e5
---

diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index a24f97a1f6..812f309a08 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -6,6 +6,7 @@ MediaWiki 1.28 is an alpha-quality branch and is not recommended for use in
 production.
 
 === Configuration changes in 1.28 ===
+* $wgSend404Code now affects status code of action=history if the page is not there.
 * BREAKING CHANGE: $wgHTTPProxy is now *required* for all external requests
   made by MediaWiki via a proxy. Relying on the http_proxy environment
   variable is no longer supported.
@@ -71,6 +72,7 @@ production.
 ==== Removed and replaced external libraries ====
 
 === Bug fixes in 1.28 ===
+* (T146496) action=history pages should return 404 HTTP error code if the page does not exist
 * (T137264) SECURITY: XSS in unclosed internal links
 * (T133147) SECURITY: Escape '<' and ']]>' in inline <style> blocks
 * (T133147) SECURITY: Require login to preview user CSS pages
diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php
index f3ef3b3cb6..1e1bb39aec 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -139,6 +139,10 @@ class HistoryAction extends FormlessAction {
 
 		// Fail nicely if article doesn't exist.
 		if ( !$this->page->exists() ) {
+			global $wgSend404Code;
+			if ( $wgSend404Code ) {
+				$out->setStatusCode( 404 );
+			}
 			$out->addWikiMsg( 'nohistory' );
 			# show deletion/move log if there is an entry
 			LogEventsList::showLogExtract(