jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/374428 )

Change subject: Only escape argument value
......................................................................


Only escape argument value

Change-Id: I819dcc32f0b1894e122793da13d99e7538c52d93
---
M Score.body.php
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Score.body.php b/Score.body.php
index 87b6635..eff9052 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/374428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I819dcc32f0b1894e122793da13d99e7538c52d93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Ebe123 <beauleetien...@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to