Tim Starling has submitted this change and it was merged.
Change subject: Fixed bogus variable reference.
......................................................................
Fixed bogus variable reference.
Change-Id: Ida983aa656bae44a9ccfc14595acb305a63005bb
---
M Score.body.php
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
Tim Starling: Verified; Looks good to me, approved
diff --git a/Score.body.php b/Score.body.php
index 3240550..61e2938 100644
--- a/Score.body.php
+++ b/Score.body.php
@@ -398,7 +398,7 @@
$prof = new Score_ScopedProfiling( __METHOD__ );
try {
$backend = self::getBackend();
- $fileIter = $backend->getFileList(
+ $fileIter = $backend->getFileList(
array( 'dir' => $options['dest_storage_path'],
'topOnly' => true ) );
$existingFiles = array();
foreach ( $fileIter as $file ) {
@@ -410,10 +410,10 @@
$multi1FileName =
"{$options['file_name_prefix']}-1.png";
$midiFileName = "{$options['file_name_prefix']}.midi";
if (
- (
- !isset( $existingFiles[$imageFileName]
)
- && !isset(
$existingFiles[$multi1FileName] )
- )
+ (
+ !isset( $existingFiles[$imageFileName] )
+ && !isset(
$existingFiles[$multi1FileName] )
+ )
|| !isset( $existingFiles[$midiFileName] ) )
{
$existingFiles += self::generatePngAndMidi(
$code, $options );
@@ -440,7 +440,7 @@
$sourcePath =
"{$options['factory_directory']}/file.midi";
if ( !file_exists( $sourcePath
) ) {
// No, need to fetch it
from the backend
- $sourceFileRef =
$backend->getLocalReference(
+ $sourceFileRef =
$backend->getLocalReference(
array( 'src' =>
"{$options['dest_storage_path']}/$midiFileName" ) );
$sourcePath =
$sourceFileRef->getPath();
}
@@ -458,7 +458,7 @@
'src' =>
"{$options['dest_url']}/$imageFileName",
'alt' => $code,
) );
- } elseif ( isset( $existingFiles[$multi1Path] ) ) { //
@fixme: $multi1Path is undefined
+ } elseif ( isset( $existingFiles[$multi1FileName] ) ) {
$link = '';
for ( $i = 1; ; ++$i ) {
$fileName =
"{$options['file_name_prefix']}-$i.png";
@@ -533,7 +533,7 @@
* @param $options array Rendering options. They are the same as for
* Score::generateHTML().
*
- * @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.
@@ -783,7 +783,7 @@
/* Generate LilyPond code by score language */
switch ( $options['lang'] ) {
case 'ABC':
- self::generateLilypondFromAbc(
+ self::generateLilypondFromAbc(
$code, $options['factory_directory'],
$options['lilypond_path'] );
break;
case 'lilypond':
--
To view, visit https://gerrit.wikimedia.org/r/63817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida983aa656bae44a9ccfc14595acb305a63005bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
