jenkins-bot has submitted this change and it was merged.
Change subject: build: Updating development dependencies
......................................................................
build: Updating development dependencies
* mediawiki/mediawiki-codesniffer: 0.4.0 → 0.5.0
Change-Id: I3a87950bb6e26c9a48d6f0d5e06d0f228c0c7748
---
M composer.json
M frontend/specialpages/actions/ConfirmAccount_body.php
M frontend/specialpages/actions/UserCredentials_body.php
3 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 4365e8a..99741dd 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9",
- "mediawiki/mediawiki-codesniffer": "0.4.0"
+ "mediawiki/mediawiki-codesniffer": "0.5.0"
},
"scripts": {
"test": [
diff --git a/frontend/specialpages/actions/ConfirmAccount_body.php
b/frontend/specialpages/actions/ConfirmAccount_body.php
index c44dafd..3e0027e 100644
--- a/frontend/specialpages/actions/ConfirmAccount_body.php
+++ b/frontend/specialpages/actions/ConfirmAccount_body.php
@@ -631,8 +631,9 @@
$linkList .= "<li><a
href='$link'>$link</a>$extra</li>\n";
}
$count++;
- if ( $count >= $max )
+ if ( $count >= $max ) {
break;
+ }
}
if ( $linkList == '' ) {
$linkList = wfMessage( 'confirmaccount-none-p'
)->escaped();
diff --git a/frontend/specialpages/actions/UserCredentials_body.php
b/frontend/specialpages/actions/UserCredentials_body.php
index 4b8d53d..4685729 100644
--- a/frontend/specialpages/actions/UserCredentials_body.php
+++ b/frontend/specialpages/actions/UserCredentials_body.php
@@ -230,8 +230,9 @@
function getAccountData() {
$uid = User::idFromName( $this->target );
- if ( !$uid )
+ if ( !$uid ) {
return false;
+ }
# For now, just get the first revision...
$dbr = wfGetDB( DB_SLAVE );
$row = $dbr->selectRow( 'account_credentials', '*',
--
To view, visit https://gerrit.wikimedia.org/r/248516
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a87950bb6e26c9a48d6f0d5e06d0f228c0c7748
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ConfirmAccount
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
