[MediaWiki-commits] [Gerrit] mediawiki...OAuthAuthentication[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

2017-08-11 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/371356 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

Change-Id: Ife3394303d9ddba61ae18baef05871533273ffb3
---
M composer.json
M utils/Hooks.php
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/composer.json b/composer.json
index 3c8225d..05b8a51 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.1"
+   "mediawiki/mediawiki-codesniffer": "0.11.0"
},
"scripts": {
"test": [
diff --git a/utils/Hooks.php b/utils/Hooks.php
index 8c4d8d6..51cfb1b 100644
--- a/utils/Hooks.php
+++ b/utils/Hooks.php
@@ -13,8 +13,8 @@
if ( $wgUser->getID() == 0 ) {
$query = [];
if ( $title->isSpecial( 'Userlogout' ) ) {
-   $query['returnto'] =  $wgRequest->getVal( 
'returnto', 'Main_Page' );
-   $query['returntoquery'] =  $wgRequest->getVal( 
'returntoquery' );
+   $query['returnto'] = $wgRequest->getVal( 
'returnto', 'Main_Page' );
+   $query['returntoquery'] = $wgRequest->getVal( 
'returntoquery' );
} else {
$query['returnto'] = $title->getPrefixedText();
$returntoquery = $wgRequest->getValues();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife3394303d9ddba61ae18baef05871533273ffb3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuthAuthentication
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] mediawiki...OAuthAuthentication[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

2017-08-10 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371356 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

Change-Id: Ife3394303d9ddba61ae18baef05871533273ffb3
---
M composer.json
M utils/Hooks.php
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuthAuthentication 
refs/changes/56/371356/1

diff --git a/composer.json b/composer.json
index 3c8225d..05b8a51 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.10.1"
+   "mediawiki/mediawiki-codesniffer": "0.11.0"
},
"scripts": {
"test": [
diff --git a/utils/Hooks.php b/utils/Hooks.php
index 8c4d8d6..51cfb1b 100644
--- a/utils/Hooks.php
+++ b/utils/Hooks.php
@@ -13,8 +13,8 @@
if ( $wgUser->getID() == 0 ) {
$query = [];
if ( $title->isSpecial( 'Userlogout' ) ) {
-   $query['returnto'] =  $wgRequest->getVal( 
'returnto', 'Main_Page' );
-   $query['returntoquery'] =  $wgRequest->getVal( 
'returntoquery' );
+   $query['returnto'] = $wgRequest->getVal( 
'returnto', 'Main_Page' );
+   $query['returntoquery'] = $wgRequest->getVal( 
'returntoquery' );
} else {
$query['returnto'] = $title->getPrefixedText();
$returntoquery = $wgRequest->getValues();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife3394303d9ddba61ae18baef05871533273ffb3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuthAuthentication
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits