r105439 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r105438‎ | r105439 | r105440 >
Date:16:51, 7 December 2011
Author:jeroendedauw
Status:ok
Tags:
Comment:
follow up to some change where a legal code arg was added to license messages
Modified paths:
  • /trunk/extensions/UploadWizard/UploadWizardHooks.php (modified) (history)
  • /trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php (modified) (history)

Diff [purge]

Index: trunk/extensions/UploadWizard/UploadWizardHooks.php
@@ -543,7 +543,7 @@
544544 *
545545 * @return string
546546 */
547 - protected static function getLicenseMessage( $licenseName, array &$licenseConfig ) {
 547+ public static function getLicenseMessage( $licenseName, array &$licenseConfig ) {
548548 if ( array_key_exists( 'url', $licenseConfig[$licenseName] ) ) {
549549 return wfMsgExt( $licenseConfig[$licenseName]['msg'], 'parseinline', '', $licenseConfig[$licenseName]['url'] );
550550 }
Index: trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php
@@ -214,7 +214,7 @@
215215 );
216216
217217 foreach ( $globalConfig['licensesOwnWork']['licenses'] as $license ) {
218 - $licenceMsg = wfMsg( $globalConfig['licenses'][$license]['msg'] );
 218+ $licenceMsg = UploadWizardHooks::getLicenseMessage( $license, $globalConfig['licenses'] );
219219 $config['licensesOwnWork']['options'][$licenceMsg] = $license;
220220 }
221221

Status & tagging log