From 0f5032050221ac219c5e04bc6b18571abfa5c175 Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Wed, 18 Apr 2018 18:35:41 -0700 Subject: [PATCH] Remove deprecated function wfInitShellLocale() Deprecated in 1.30, never had more than 2-3 callers. Change-Id: Ia023ede41affaf8e1b5fd1fed77cdbcefc9dc243 --- RELEASE-NOTES-1.32 | 1 + includes/GlobalFunctions.php | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32 index 291e4184f9..532aedab69 100644 --- a/RELEASE-NOTES-1.32 +++ b/RELEASE-NOTES-1.32 @@ -48,6 +48,7 @@ changes to languages because of Phabricator reports. * The MediaWikiI18N class was removed (deprecated in 1.31). * QuickTemplate::setTranslator() was removed (deprecated in 1.31). Use Skin::msg() instead. +* wfInitShellLocale() was removed (deprecated in 1.30). === Deprecations in 1.32 === * Use of a StartProfiler.php file is deprecated in favour of placing diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 3dfe12e7fc..06f95acade 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -2362,18 +2362,6 @@ function wfShellExecWithStderr( $cmd, &$retval = null, $environ = [], $limits = [ 'duplicateStderr' => true, 'profileMethod' => wfGetCaller() ] ); } -/** - * Formerly set the locale for locale-sensitive operations - * - * This is now done in Setup.php. - * - * @deprecated since 1.30, no longer needed - * @see $wgShellLocale - */ -function wfInitShellLocale() { - wfDeprecated( __FUNCTION__, '1.30' ); -} - /** * Generate a shell-escaped command line string to run a MediaWiki cli script. * Note that $parameters should be a flat array and an option with an argument -- 2.20.1