[ticket/12056] Fix failure due to "Creating default object from empty value".

PHPBB3-12056
Merge remote-tracking branch 'bantu/ticket/12056' into develop-olympus

* bantu/ticket/12056:
  [ticket/12056] Fix failure due to "Creating default object from empty value".
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/12056] Fix failure due to "Creating default object from empty value".