From f4668d6c125eed9ca5008ec2453aaa3a581b10ab Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Wed, 18 Apr 2018 18:41:00 -0700 Subject: [PATCH] Remove deprecated function wfShellExecDisabled() Deprecated in 1.30, never had many callers. Change-Id: Ie77c3df696313f691a68f21b15804539ffcc7f88 --- 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 532aedab69..7971bccdf1 100644 --- a/RELEASE-NOTES-1.32 +++ b/RELEASE-NOTES-1.32 @@ -49,6 +49,7 @@ changes to languages because of Phabricator reports. * QuickTemplate::setTranslator() was removed (deprecated in 1.31). Use Skin::msg() instead. * wfInitShellLocale() was removed (deprecated in 1.30). +* wfShellExecDisabled() 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 06f95acade..1a3f50ac43 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -2269,18 +2269,6 @@ function wfEscapeShellArg( /*...*/ ) { return call_user_func_array( Shell::class . '::escape', $args ); } -/** - * Check if wfShellExec() is effectively disabled via php.ini config - * - * @return bool|string False or 'disabled' - * @since 1.22 - * @deprecated since 1.30 use MediaWiki\Shell::isDisabled() - */ -function wfShellExecDisabled() { - wfDeprecated( __FUNCTION__, '1.30' ); - return Shell::isDisabled() ? 'disabled' : false; -} - /** * Execute a shell command, with time and memory limits mirrored from the PHP * configuration if supported. -- 2.20.1