diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
commit | 6dc1997577fab2c366781fd7048144935afa0012 (patch) | |
tree | 8918d28c7ab4342f0738985e37af1dfc42d0e93a /includes/WebStart.php | |
parent | 150f94f051128f367bc89f6b7e5f57eb2a69fc62 (diff) | |
parent | fa89acd685cb09cdbe1c64cbb721ec64975bbbc1 (diff) |
Merge commit 'fa89acd'
# Conflicts:
# .gitignore
# extensions/ArchInterWiki.sql
Diffstat (limited to 'includes/WebStart.php')
-rw-r--r-- | includes/WebStart.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/includes/WebStart.php b/includes/WebStart.php index 9c71f3e1..f5a4f93b 100644 --- a/includes/WebStart.php +++ b/includes/WebStart.php @@ -78,7 +78,6 @@ if ( $IP === false ) { # Grab profiling functions require_once "$IP/includes/profiler/ProfilerFunctions.php"; -$wgRUstart = wfGetRusage() ?: array(); # Start the autoloader, so that extensions can derive classes from core files require_once "$IP/includes/AutoLoader.php"; @@ -137,3 +136,8 @@ if ( ob_get_level() == 0 ) { if ( !defined( 'MW_NO_SETUP' ) ) { require_once "$IP/includes/Setup.php"; } + +# Multiple DBs or commits might be used; keep the request as transactional as possible +if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] === 'POST' ) { + ignore_user_abort( true ); +} |