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

Change subject: Remove rawAndMidi from cache options
......................................................................


Remove rawAndMidi from cache options

This was an unnecessary addition from I6a0a239b6. It is un-needed as
whenever the `midi` block is included in a `<score` tag, it will be
generated. In raw scores, if the attributes have been changed to include
the files, either the MIDI would already exist, thus no need for
re-generation, or the code would be modified, making the hash different.

Bug: T49448
Change-Id: I56c6034834a5b706c2f897362212e0ad62314b0c
---
M includes/Score.php
1 file changed, 0 insertions(+), 6 deletions(-)

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



diff --git a/includes/Score.php b/includes/Score.php
index e6df438..e6d9eb5 100644
--- a/includes/Score.php
+++ b/includes/Score.php
@@ -282,12 +282,6 @@
                                'ExtVersion' => self::CACHE_VERSION,
                                'LyVersion' => self::getLilypondVersion(),
                        ];
-                       // Doing this separately to not invalidate too many 
existing keys.
-                       if ( $options['raw'] && ( $options['generate_ogg']
-                               || ( $options['link_midi'] && 
!$options['override_midi'] )
-                       ) ) {
-                               $cacheOptions['rawAndMidi'] = true;
-                       }
 
                        /* image file path and URL prefixes */
                        $imageCacheName = Wikimedia\base_convert( sha1( 
serialize( $cacheOptions ) ), 16, 36, 31 );

-- 
To view, visit https://gerrit.wikimedia.org/r/400460
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I56c6034834a5b706c2f897362212e0ad62314b0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Ebe123 <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Brian Wolff <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Ebe123 <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to