Suppress empty lines during teleporter import #1921
Merged
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.
git rebase
)git commit --signoff
)What does this PR aim to accomplish?:
During Teleporter import
deleteAllCustomDNSEntries
,addCustomDNSEntry
,deleteAllCustomCNAMEEntries
andaddCustomCNAMEEntry
are called. They all finish by callinghttps://github.com/pi-hole/AdminLTE/blob/5588be9c9086ec120cd3bd4dc36bc9d4ed0acd77/scripts/pi-hole/php/func.php#L432
which outputs
<br>
if$json
is nottrue
(which it never is during teleporter import)https://github.com/pi-hole/AdminLTE/blob/5588be9c9086ec120cd3bd4dc36bc9d4ed0acd77/scripts/pi-hole/php/func.php#L459-L467
So for every entry in Local DNS records or CNAME Records an empty line is printed.
This PR does suppress the output by using output_buffer.
Before
After