From df43a26e0a3cff7d6d353e137b49dc70cadb024e Mon Sep 17 00:00:00 2001 From: Yuri Astrakhan Date: Wed, 8 Oct 2014 14:12:11 -0400 Subject: [PATCH] Minor doc fix for wfShellExecWithStderr() Change-Id: I9d5fe442c6e85d61c1cdec8c42caab06b37856b1 --- includes/GlobalFunctions.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 03bdd767c2..2c26fef69d 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -2986,7 +2986,9 @@ function wfShellExec( $cmd, &$retval = null, $environ = array(), * 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 -- 2.20.1