[develop] Fix incorrect merge conflict resolution from PR #2085

PHPBB3-12235