From: Max Semenik <maxsem.wiki@gmail.com>
Date: Thu, 19 Apr 2018 01:41:00 +0000 (-0700)
Subject: Remove deprecated function wfShellExecDisabled()
X-Git-Tag: 1.34.0-rc.0~5654^2~1
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=f4668d6c125eed9ca5008ec2453aaa3a581b10ab;p=lhc%2Fweb%2Fwiklou.git

Remove deprecated function wfShellExecDisabled()

Deprecated in 1.30, never had many callers.

Change-Id: Ie77c3df696313f691a68f21b15804539ffcc7f88
---

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.