Fomafix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/345652 )
Change subject: Use consistent spaces at start and end of comments
......................................................................
Use consistent spaces at start and end of comments
Change-Id: Idbb09b69aa1ef4e46433319aaea62f34f0dbc038
---
M includes/EditPage.php
M includes/media/IPTC.php
M includes/page/Article.php
M includes/widget/search/InterwikiSearchResultSetWidget.php
M resources/src/mediawiki.legacy/oldshared.css
M
resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
M resources/src/mediawiki.special/mediawiki.special.userlogin.common.css
M resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
M tests/parser/DbTestPreviewer.php
M tests/selenium/wdio.conf.jenkins.js
M tests/selenium/wdio.conf.js
11 files changed, 16 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/52/345652/1
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 7d19e94..e4d217c 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2421,7 +2421,7 @@
# Show log extract when the user is currently blocked
if ( $namespace == NS_USER || $namespace == NS_USER_TALK ) {
$username = explode( '/', $this->mTitle->getText(), 2
)[0];
- $user = User::newFromName( $username, false /* allow IP
users*/ );
+ $user = User::newFromName( $username, false /* allow IP
users */ );
$ip = User::isIP( $username );
$block = Block::newFromTarget( $user, $user );
if ( !( $user && $user->isLoggedIn() ) && !$ip ) { #
User does not exist
diff --git a/includes/media/IPTC.php b/includes/media/IPTC.php
index f93b1b5..b7ebfc9 100644
--- a/includes/media/IPTC.php
+++ b/includes/media/IPTC.php
@@ -97,7 +97,7 @@
case '2#025': /* keywords */
$data['Keywords'] = self::convIPTC(
$val, $c );
break;
- case '2#101': /* Country (shown)*/
+ case '2#101': /* Country (shown) */
$data['CountryDest'] = self::convIPTC(
$val, $c );
break;
case '2#095': /* state/province (shown) */
@@ -115,7 +115,7 @@
case '2#040': /* special instructions */
$data['SpecialInstructions'] =
self::convIPTC( $val, $c );
break;
- case '2#105': /* headline*/
+ case '2#105': /* headline */
$data['Headline'] = self::convIPTC(
$val, $c );
break;
case '2#110': /* credit */
diff --git a/includes/page/Article.php b/includes/page/Article.php
index 6067649..ee0ff22 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1133,7 +1133,7 @@
|| $title->getNamespace() == NS_USER_TALK
) {
$rootPart = explode( '/', $title->getText() )[0];
- $user = User::newFromName( $rootPart, false /* allow IP
users*/ );
+ $user = User::newFromName( $rootPart, false /* allow IP
users */ );
$ip = User::isIP( $rootPart );
$block = Block::newFromTarget( $user, $user );
diff --git a/includes/widget/search/InterwikiSearchResultSetWidget.php
b/includes/widget/search/InterwikiSearchResultSetWidget.php
index b1b8c73..1911c79 100644
--- a/includes/widget/search/InterwikiSearchResultSetWidget.php
+++ b/includes/widget/search/InterwikiSearchResultSetWidget.php
@@ -131,7 +131,7 @@
: "";
if ( isset( $this->customCaptions[$iwPrefix] ) ) {
- /* customCaptions composed by loadCustomCaptions() with
pre-escaped content.*/
+ /* customCaptions composed by loadCustomCaptions() with
pre-escaped content. */
$caption = $this->customCaptions[$iwPrefix];
} else {
$interwiki = $this->iwLookup->fetch( $iwPrefix );
diff --git a/resources/src/mediawiki.legacy/oldshared.css
b/resources/src/mediawiki.legacy/oldshared.css
index 7c4dbb1..7b2d711 100644
--- a/resources/src/mediawiki.legacy/oldshared.css
+++ b/resources/src/mediawiki.legacy/oldshared.css
@@ -459,4 +459,4 @@
display: block;
}
-/* RTL specific CSS ends here **/
+/** RTL specific CSS ends here **/
diff --git
a/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
b/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
index 0b0f912..d5e1c48 100644
---
a/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
+++
b/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
@@ -148,7 +148,7 @@
left: 0;
text-align: center;
color: #fff;
- text-shadow: 0 0 10px rgba( 0, 0, 0, 0.4 ); /* improves legibility on
white background*/
+ text-shadow: 0 0 10px rgba( 0, 0, 0, 0.4 ); /* improves legibility on
white background */
font-size: 0.8em;
padding: 5px;
background-color: rgba( 0, 0, 0, 0.5 );
@@ -183,7 +183,7 @@
#mw-interwiki-results {
width: 30%;
- display: inline-block; /* used to align iw sidebar with the top
of the main search results*/
+ display: inline-block; /* used to align iw sidebar with the top
of the main search results */
margin-left: 10%;
}
.searchresults .mw-search-createlink,
diff --git
a/resources/src/mediawiki.special/mediawiki.special.userlogin.common.css
b/resources/src/mediawiki.special/mediawiki.special.userlogin.common.css
index 9da6c83..4a48f46 100644
--- a/resources/src/mediawiki.special/mediawiki.special.userlogin.common.css
+++ b/resources/src/mediawiki.special/mediawiki.special.userlogin.common.css
@@ -29,7 +29,7 @@
font-size: 0.8em;
}
-/* Put some space under template's header, which may contain CAPTCHA HTML.*/
+/* Put some space under template's header, which may contain CAPTCHA HTML. */
section.mw-form-header {
margin-bottom: 10px;
}
diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index 2f90fe6..3fcbb3f 100644
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -1,4 +1,4 @@
-/* global moment*/
+/* global moment */
( function ( $, mw, moment ) {
/**
diff --git a/tests/parser/DbTestPreviewer.php b/tests/parser/DbTestPreviewer.php
index 5ce0b34..784c29c 100644
--- a/tests/parser/DbTestPreviewer.php
+++ b/tests/parser/DbTestPreviewer.php
@@ -93,7 +93,7 @@
$before = 'n';
} elseif ( $prevResults[$test] == 1 ) {
$before = 'p';
- } else /* if ( $prevResults[$test] == 0 )*/ {
+ } else /* if ( $prevResults[$test] == 0 ) */ {
$before = 'f';
}
@@ -101,7 +101,7 @@
$after = 'n';
} elseif ( $this->results[$test] == 1 ) {
$after = 'p';
- } else /*if ( $this->results[$test] == 0 ) */ {
+ } else /* if ( $this->results[$test] == 0 ) */ {
$after = 'f';
}
diff --git a/tests/selenium/wdio.conf.jenkins.js
b/tests/selenium/wdio.conf.jenkins.js
index 4491c8e..6049eb2 100644
--- a/tests/selenium/wdio.conf.jenkins.js
+++ b/tests/selenium/wdio.conf.jenkins.js
@@ -1,5 +1,5 @@
-/* eslint no-undef: "error"*/
-/* eslint-env node*/
+/* eslint no-undef: "error" */
+/* eslint-env node */
'use strict';
var merge = require( 'deepmerge' ),
wdioConf = require( './wdio.conf.js' );
diff --git a/tests/selenium/wdio.conf.js b/tests/selenium/wdio.conf.js
index b5dc61a..f132899 100644
--- a/tests/selenium/wdio.conf.js
+++ b/tests/selenium/wdio.conf.js
@@ -1,7 +1,7 @@
/* eslint comma-dangle: 0 */
-/* eslint no-undef: "error"*/
+/* eslint no-undef: "error" */
/* eslint no-console: 0 */
-/* eslint-env node*/
+/* eslint-env node */
'use strict';
const path = require( 'path' );
--
To view, visit https://gerrit.wikimedia.org/r/345652
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbb09b69aa1ef4e46433319aaea62f34f0dbc038
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Fomafix <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
