From d6727856fd1917d8f6da6264f35a274cb37f3463 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Fri, 27 Oct 2023 14:34:10 +1100 Subject: Support new block schema Support migration stages when reading and writing blocks. I tried to set it up for an easy next stage, in which support for the old schema is removed. I tried to avoid factoring out of shared code between the two schemas, so that the old schema cases can simply be deleted without the need to revert unnecessary abstractions. However, I added HideUserUtils to factor out ipb_deleted queries. Code review showed that this was already quite complex, with multiple approaches to the problem, so it benefits from refactoring even without the schema abstraction. HideUserUtils is a service rather than a standalone class to support unit tests, since unit tests do not allow global config access. When the migration stage config is removed, it will be a service with no constructor parameters -- an unnecessary abstraction which should ideally be resolved at that time. When interpreting result rows, it is possible to share code by using field aliases. But when constructing WHERE conditions, the actual field names need to be used, so the migration is more intrusive in ApiQueryBlocks and SpecialBlockList, where complex conditions are used. Bug: T346293 Bug: T51504 Bug: T349883 Change-Id: I408acf7a57b0100fe18c455fc13141277a598925 --- includes/specials/SpecialBlock.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'includes/specials/SpecialBlock.php') diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php index 9fe912a713b6..2627a6800e7d 100644 --- a/includes/specials/SpecialBlock.php +++ b/includes/specials/SpecialBlock.php @@ -486,7 +486,7 @@ class SpecialBlock extends FormSpecialPage { $fields['DisableUTEdit']['default'] = !$block->isUsertalkEditAllowed(); } - // If the username was hidden (ipb_deleted == 1), don't show the reason + // If the username was hidden (bl_deleted == 1), don't show the reason // unless this user also has rights to hideuser: T37839 if ( !$block->getHideName() || $this->getAuthority()->isAllowed( 'hideuser' ) ) { $fields['Reason']['default'] = $block->getReasonComment()->text; -- cgit v1.2.3