From 7838fe300a1d6770694800e684e05127bd9a06d1 Mon Sep 17 00:00:00 2001 From: Ricordisamoa Date: Fri, 14 Aug 2015 23:46:12 +0200 Subject: [PATCH] Remove unused globals * $wgLogExceptionBacktrace from MWExceptionHandler unused since 77a397125fd1b901c3141cbfe7084a7534ff881b * $wgPasswordPolicy from WebInstallerName unused since 6a69a4eb733bd6129533c93b7a1ca4564b16ac32 Change-Id: Ibaac1bad05f4326a2602958a93d4d46135bdca63 --- includes/exception/MWExceptionHandler.php | 4 ---- includes/installer/WebInstallerPage.php | 2 -- 2 files changed, 6 deletions(-) diff --git a/includes/exception/MWExceptionHandler.php b/includes/exception/MWExceptionHandler.php index 3f25930f0d..663b0fff81 100644 --- a/includes/exception/MWExceptionHandler.php +++ b/includes/exception/MWExceptionHandler.php @@ -522,8 +522,6 @@ TXT; * @param Exception $e */ public static function logException( Exception $e ) { - global $wgLogExceptionBacktrace; - if ( !( $e instanceof MWException ) || $e->isLoggable() ) { $logger = LoggerFactory::getInstance( 'exception' ); $logger->error( @@ -549,8 +547,6 @@ TXT; * @param string $channel */ protected static function logError( ErrorException $e, $channel ) { - global $wgLogExceptionBacktrace; - // The set_error_handler callback is independent from error_reporting. // Filter out unwanted errors manually (e.g. when MediaWiki\suppressWarnings is active). $suppressed = ( error_reporting() & $e->getSeverity() ) === 0; diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php index 1de6184c5b..8715d51680 100644 --- a/includes/installer/WebInstallerPage.php +++ b/includes/installer/WebInstallerPage.php @@ -833,8 +833,6 @@ class WebInstallerName extends WebInstallerPage { * @return bool */ public function submit() { - global $wgPasswordPolicy; - $retVal = true; $this->parent->setVarsFromRequest( array( 'wgSitename', '_NamespaceType', '_AdminName', '_AdminPassword', '_AdminPasswordConfirm', '_AdminEmail', -- 2.20.1