Stop flattening config options added in config.php #5493

Merged
merged 6 commits into from Jan 17, 2017

Projects

None yet

5 participants

@geordish
Contributor

Found the bug. Shouldn't break things this time :(

DO NOT DELETE THIS TEXT

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

  • Have you signed the Contributors agreement - please do NOT submit a pull request unless you have (signing the agreement in the same pull request is fine). Your commit message for signing the agreement must appear as per the docs.
  • Have you followed our code guidelines?
geordish added some commits Jan 17, 2017
@geordish geordish Stop flattening config options added in config.php
5e4a96d
@geordish geordish array_replace_recursive seems to break pretty bad if one of the array…
…s is null. Check for this first
da2bf6d
@mention-bot

Thank you for submitting a PR @geordish! We have found the following @murrant, @Rosiak and @paulgear based on the history of these files to review this PR.

@geordish geordish Fix silly copy/paste error
18088c7
@geordish geordish Fix silly copy/paste error
5bd61c8
geordish added some commits Jan 17, 2017
@geordish geordish Fix silly copy/paste error 28a59c4
@geordish geordish Fix silly copy/paste error
bc6b882
@scrutinizer-notifier

The inspection completed: No new issues

@laf
laf approved these changes Jan 17, 2017 View changes
@laf laf merged commit 7fc2834 into librenms:master Jan 17, 2017

2 checks passed

Auto-Deploy Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment