Reedy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/374437 )
Change subject: Only escape argument value ...................................................................... Only escape argument value Change-Id: I819dcc32f0b1894e122793da13d99e7538c52d93 (cherry picked from commit dc8c5f0c8587c0a520dd0556e70a73ccca6a7a72) --- M Score.body.php 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score refs/changes/37/374437/1 diff --git a/Score.body.php b/Score.body.php index 84e3a89..5f68105 100644 --- a/Score.body.php +++ b/Score.body.php @@ -164,7 +164,7 @@ } self::$backend = new FSFileBackend( [ 'name' => 'score-backend', - 'wikiId' => wfWikiId(), + 'wikiId' => wfWikiID(), 'lockManager' => new NullLockManager( [] ), 'containerPaths' => [ 'score-render' => $dir ], 'fileMode' => 0777, @@ -504,7 +504,7 @@ * Score::generateHTML(). * @parma $metaData array to hold information about images * - * @return Array of file names placed in the remote dest dir, with the + * @return array of file names placed in the remote dest dir, with the * file names in each key. * * @throws ScoreException on error. @@ -761,7 +761,7 @@ /* Run timidity */ $cmd = wfEscapeShellArg( $wgScoreTimidity ) . ' -Ov' // Vorbis output - . ' ' . wfEscapeShellArg( '--output-file=' . $factoryOgg ) + . ' --output-file=' . wfEscapeShellArg( $factoryOgg ) . ' ' . wfEscapeShellArg( $sourceFile ) . ' 2>&1'; $output = wfShellExec( $cmd, $rc ); @@ -851,7 +851,7 @@ /* Convert to LilyPond file */ $cmd = wfEscapeShellArg( $wgScoreAbc2Ly ) . ' -s' - . ' ' . wfEscapeShellArg( '--output=' . $destFile ) + . ' --output=' . wfEscapeShellArg( $destFile ) . ' ' . wfEscapeShellArg( $factoryAbc ) . ' 2>&1'; $output = wfShellExec( $cmd, $rc ); @@ -877,7 +877,7 @@ /** * get length of ogg vorbis file * - * @param $path file system path to file + * @param string $path file system path to file * * @return float duration in seconds */ -- To view, visit https://gerrit.wikimedia.org/r/374437 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I819dcc32f0b1894e122793da13d99e7538c52d93 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Score Gerrit-Branch: wmf/1.30.0-wmf.15 Gerrit-Owner: Reedy <re...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits