From 637297c7c5854d6eb7a617d12a333e5cbff698b1 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Mon, 3 Mar 2014 13:12:11 -0800 Subject: [PATCH] Commit DB changes as normal on exception-based GUI errors Bug: 62091 Change-Id: I36cd645d5f7a939b60f306e5fc093507693b097b --- includes/Wiki.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/includes/Wiki.php b/includes/Wiki.php index fbafba8139..9e8c720be0 100644 --- a/includes/Wiki.php +++ b/includes/Wiki.php @@ -444,7 +444,15 @@ class MediaWiki { public function run() { try { $this->checkMaxLag(); - $this->main(); + try { + $this->main(); + } catch ( ErrorPageError $e ) { + // Bug 62091: while exceptions are convenient to bubble up GUI errors, + // they are not internal application faults. As with normal requests, this + // should commit, print the output, do deferred updates, jobs, and profiling. + wfGetLBFactory()->commitMasterChanges(); + $e->report(); // display the GUI error + } if ( function_exists( 'fastcgi_finish_request' ) ) { fastcgi_finish_request(); } -- 2.20.1