From 59ce3456a8007d76875fe8fb21eff4a90b214034 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Tue, 14 Nov 2017 11:17:02 -0500 Subject: [PATCH] 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 --- includes/api/ApiBase.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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' ) { -- 2.20.1