From: Bill Pirkle <bpirkle@wikimedia.org>
Date: Wed, 1 Aug 2018 14:21:13 +0000 (-0500)
Subject: Remove deprecated variable usage from Maintenance.php
X-Git-Tag: 1.34.0-rc.0~4572^2
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=6dab8d553e7661fe07e47ee91fe0e96c66f4bbc1;p=lhc%2Fweb%2Fwiklou.git

Remove deprecated variable usage from Maintenance.php

Idead2c11c4 deprecated and made nonfunctional the
$wgShowSQLErrors variable, but failed to remove its
usage from Maintenance.php.
This commit removes that usage and replaces it with the
new perferred method of enabling detailed output.

Bug: T165768
Change-Id: I98620ddd493703863755f426dd54f7a4e5ae05f1
---

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index c4a7594405..d919249030 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -1118,7 +1118,7 @@ abstract class Maintenance {
 	 * Handle some last-minute setup here.
 	 */
 	public function finalSetup() {
-		global $wgCommandLineMode, $wgShowSQLErrors, $wgServer;
+		global $wgCommandLineMode, $wgServer, $wgShowExceptionDetails, $wgShowHostnames;
 		global $wgDBadminuser, $wgDBadminpassword, $wgDBDefaultGroup;
 		global $wgDBuser, $wgDBpassword, $wgDBservers, $wgLBFactoryConf;
 
@@ -1177,7 +1177,8 @@ abstract class Maintenance {
 
 		$this->afterFinalSetup();
 
-		$wgShowSQLErrors = true;
+		$wgShowExceptionDetails = true;
+		$wgShowHostnames = true;
 
 		Wikimedia\suppressWarnings();
 		set_time_limit( 0 );