Review main Merged

61374[BUGFIX] Make sure AdditionalConfiguration is loaded

Jonas Eberle CR +2 V +2 Easy +6 −4 updated 08/03/19, 09:15

Commit message

This loads AdditionalConfiguration.php even if LocalConfiguration.php
could not be loaded.

Before this change, configuration for the install tool could only be
given if a LocalConfiguration was present.

With this change, AdditionalConfiguration (if present) is applied
on top of DefaultConfiguration.

In a FIRST_INSTALL scenario, this enables (among others) the correct
evaluation of a set trustedHostsPattern in AdditionalConfiguration.

Review

  • Code review CR +2

    Imported before Forger kept the single votes, the next import adds them.

  • Verified V +2

    Imported before Forger kept the single votes, the next import adds them.

Issues 2

Files 1