[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SECURITY: Fix rebase error in 4d38a489

2017-11-14 Thread Reedy (Code Review) 
Reedy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391456 )

Change subject: SECURITY: Fix rebase error in 4d38a489
..


SECURITY: Fix rebase error in 4d38a489

The fix for T125177 from F4932228 was incorrectly rebased when it was
applied to master as 4d38a489, causing the bug to not actually be fixed.

Bug: T180488
Change-Id: Ie6b87ef2373369987c112c19903c99afb789c1ff
---
M includes/api/ApiBase.php
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Reedy: Verified; Looks good to me, approved



diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 80aeff5..bf2b977 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -1069,10 +1069,10 @@
} else {
$type = 'NULL'; // allow everything
}
+   }
 
-   if ( $type == 'password' || !empty( 
$paramSettings[self::PARAM_SENSITIVE] ) ) {
-   $this->getMain()->markParamsSensitive( 
$encParamName );
-   }
+   if ( $type == 'password' || !empty( 
$paramSettings[self::PARAM_SENSITIVE] ) ) {
+   $this->getMain()->markParamsSensitive( $encParamName );
}
 
if ( $type == 'boolean' ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6b87ef2373369987c112c19903c99afb789c1ff
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Reedy 
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/core[master]: SECURITY: Fix rebase error in 4d38a489

2017-11-14 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391456 )

Change subject: SECURITY: Fix rebase error in 4d38a489
..

SECURITY: Fix rebase error in 4d38a489

The fix for T125177 from F4932228 was incorrectly rebased when it was
applied to master as 4d38a489, causing the bug to not actually be fixed.

Bug: T180488
Change-Id: Ie6b87ef2373369987c112c19903c99afb789c1ff
---
M includes/api/ApiBase.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/56/391456/1

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 80aeff5..bf2b977 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -1069,10 +1069,10 @@
} else {
$type = 'NULL'; // allow everything
}
+   }
 
-   if ( $type == 'password' || !empty( 
$paramSettings[self::PARAM_SENSITIVE] ) ) {
-   $this->getMain()->markParamsSensitive( 
$encParamName );
-   }
+   if ( $type == 'password' || !empty( 
$paramSettings[self::PARAM_SENSITIVE] ) ) {
+   $this->getMain()->markParamsSensitive( $encParamName );
}
 
if ( $type == 'boolean' ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6b87ef2373369987c112c19903c99afb789c1ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Reedy 

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