Tweak/custom dns #1472
Merged
Tweak/custom dns #1472
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…g this logic change prevents a misleading message being displayed to the user Signed-off-by: Adam Warner <[email protected]>
… if it is specified by the user Signed-off-by: Adam Warner <[email protected]>
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: |
PromoFaux
commented
Jun 25, 2020
Co-authored-by: Adam Warner <[email protected]>
DL6ER
reviewed
Jun 30, 2020
| $success .= "Updating DNS settings failed. Result:"; | ||
| $success .= implode($return); | ||
| } | ||
| $success .= htmlspecialchars(end($return))."<br>"; |
There was a problem hiding this comment.
So we always assume success now (if the checks above worked)?
There was a problem hiding this comment.
Well... this is how it was before the pihole wrapper code was put in.
DL6ER
approved these changes
Jun 30, 2020
Merged
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/pi-hole-5-1-released/35577/1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
By submitting this pull request, I confirm the following:
git rebase)What does this PR aim to accomplish?:
Addresses issues raised in this comment on discourse.
Seems that the PR that added the execution wrapped to the
piholecommand in the PHP introduced an issue with the error that is displayed back to the user (Despite completing successfully)Additionally I have tweaked the logic around custom ports, a port is only added to the address is it is explicitly added by the user.