SECURITY: Fix rebase error in 4d38a489
authorBrad Jorsch <bjorsch@wikimedia.org>
Tue, 14 Nov 2017 16:17:02 +0000 (11:17 -0500)
committerReedy <reedy@wikimedia.org>
Wed, 15 Nov 2017 03:21:54 +0000 (03:21 +0000)
commit59ce3456a8007d76875fe8fb21eff4a90b214034
tree5bfedace5e95521671cf8af0d305011bfecc449a
parent5b205725842edbae6ccde5a13baf20c2eb3ec4ae
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