From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Tue, 14 Nov 2017 16:17:02 +0000 (-0500)
Subject: SECURITY: Fix rebase error in 4d38a489
X-Git-Tag: 1.31.0-rc.0~1508
X-Git-Url: https://git.cyclocoop.org/%20%27.%28%24debut%20%20%20%24par_page%29.%27?a=commitdiff_plain;h=59ce3456a8007d76875fe8fb21eff4a90b214034;p=lhc%2Fweb%2Fwiklou.git

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
---

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 80aeff5478..bf2b97794e 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -1069,10 +1069,10 @@ abstract class ApiBase extends ContextSource {
 			} 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' ) {