Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "resourceloader: Fix broken 'deprecated' string messages"

Browse source
This commit is contained in:
jenkins-bot 2017-03-18 00:38:43 +00:00 committed by Gerrit Code Review
commit bf79a09a71
3 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/resourceloader/ResourceLoaderModule.php
View file

@ -147,8 +147,8 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
if ( $deprecationInfo ) {
$name = $this->getName();
$warning = 'This page is using the deprecated ResourceLoader module "' . $name . '".';
if ( !is_bool( $deprecationInfo ) && isset( $deprecationInfo['message'] ) ) {
$warning .= "\n" . $deprecationInfo['message'];
if ( is_string( $deprecationInfo ) ) {
$warning .= "\n" . $deprecationInfo;
}
return Xml::encodeJsCall(
'mw.log.warn',

12
resources/Resources.php
View file

@ -151,9 +151,7 @@ return [
'targets' => [ 'mobile', 'desktop' ],
],
'jquery.appear' => [
'deprecated' => [
'message' => 'Please use "mediawiki.viewport" instead.',
],
'deprecated' => 'Please use "mediawiki.viewport" instead.',
'scripts' => 'resources/lib/jquery/jquery.appear.js',
],
'jquery.async' => [
@ -320,9 +318,7 @@ return [
'targets' => [ 'desktop', 'mobile' ],
],
'jquery.jStorage' => [
'deprecated' => [
'message' => 'Please use "mediawiki.storage" instead.',
],
'deprecated' => 'Please use "mediawiki.storage" instead.',
'scripts' => 'resources/lib/jquery/jquery.jStorage.js',
],
'jquery.suggestions' => [
@ -366,9 +362,7 @@ return [
/* jQuery UI */
'jquery.ui.core' => [
'deprecated' => [
'message' => 'Please use "mediawiki.ui.button" or "oojs-ui" instead.',
],
'deprecated' => 'Please use "mediawiki.ui.button" or "oojs-ui" instead.',
'scripts' => 'resources/lib/jquery.ui/jquery.ui.core.js',
'dependencies' => [
'jquery.ui.core.styles',

4
tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php
View file

@ -31,9 +31,7 @@ class ResourceLoaderFileModuleTest extends ResourceLoaderTestCase {
'deprecated' => true,
],
'deprecatedTomorrow' => $base + [
'deprecated' => [
'message' => 'Will be removed tomorrow.'
],
'deprecated' => 'Will be removed tomorrow.'
],
'htmlTemplateModule' => $base + [