[MediaWiki-commits] [Gerrit] Minor doc fix for wfShellExecWithStderr() - change (mediawiki/core)
Yurik has uploaded a new change for review. https://gerrit.wikimedia.org/r/165525 Change subject: Minor doc fix for wfShellExecWithStderr() .. Minor doc fix for wfShellExecWithStderr() Change-Id: I9d5fe442c6e85d61c1cdec8c42caab06b37856b1 --- M includes/GlobalFunctions.php 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/25/165525/1 diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 03bdd76..2c26fef 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -2986,7 +2986,9 @@ * function, as all the arguments to wfShellExec can become unwieldy. * * @note This also includes errors from limit.sh, e.g. if $wgMaxShellFileSize is exceeded. - * @param string $cmd Command line, properly escaped for shell. + * @param string|string[] $cmd If string, a properly shell-escaped command line, + * or an array of unescaped arguments, in which case each value will be escaped + * Example: [ 'convert', '-font', 'font name' ] would produce 'convert' '-font' 'font name' * @param null|mixed $retval Optional, will receive the program's exit code. * (non-zero is usually failure) * @param array $environ Optional environment variables which should be -- To view, visit https://gerrit.wikimedia.org/r/165525 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d5fe442c6e85d61c1cdec8c42caab06b37856b1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Yurik yu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Minor doc fix for wfShellExecWithStderr() - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Minor doc fix for wfShellExecWithStderr() .. Minor doc fix for wfShellExecWithStderr() Change-Id: I9d5fe442c6e85d61c1cdec8c42caab06b37856b1 --- M includes/GlobalFunctions.php 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Aaron Schulz: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 03bdd76..2c26fef 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -2986,7 +2986,9 @@ * function, as all the arguments to wfShellExec can become unwieldy. * * @note This also includes errors from limit.sh, e.g. if $wgMaxShellFileSize is exceeded. - * @param string $cmd Command line, properly escaped for shell. + * @param string|string[] $cmd If string, a properly shell-escaped command line, + * or an array of unescaped arguments, in which case each value will be escaped + * Example: [ 'convert', '-font', 'font name' ] would produce 'convert' '-font' 'font name' * @param null|mixed $retval Optional, will receive the program's exit code. * (non-zero is usually failure) * @param array $environ Optional environment variables which should be -- To view, visit https://gerrit.wikimedia.org/r/165525 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d5fe442c6e85d61c1cdec8c42caab06b37856b1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Yurik yu...@wikimedia.org Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
