Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix api.php?status ( replicate #2031 and pi-hole/pi-hole#4485) #2052

Merged
merged 4 commits into from
Jan 6, 2022
Merged

Fix api.php?status ( replicate #2031 and pi-hole/pi-hole#4485) #2052

merged 4 commits into from
Jan 6, 2022

Conversation

rdwebdesign
Copy link
Member

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)
  • I have Signed Off all commits. (git commit --signoff)

What does this PR aim to accomplish?:

Fix #2051

How does this PR accomplish the above?:

Fixing the code to replicate the new behavior created for #2031.

What documentation changes (if any) are needed to support this PR?:

none, I think.

@rdwebdesign rdwebdesign linked an issue Jan 6, 2022 that may be closed by this pull request
api.php status weird behavior? #2051
Closed
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/api-status-is-wrong/52303/2

yubiuser
yubiuser approved these changes Jan 6, 2022
View reviewed changes
Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tried it locally and it worked as expected.

http://pi.hole/admin/api.php?status returned the correct status now.

@yubiuser yubiuser changed the title Replicating changes made by previous PRs (#2031 and pi-hole/pi-hole#4485) Fix api.php?status ( replicate #2031 and pi-hole/pi-hole#4485) Jan 6, 2022
@yubiuser yubiuser merged commit 7bb82d0 into pi-hole:devel Jan 6, 2022
@rdwebdesign rdwebdesign deleted the fix_status_api branch January 8, 2022 03:12
yubiuser pushed a commit that referenced this pull request Jan 11, 2022
@rdwebdesign @yubiuser
Fix api.php?status ( replicate #2031 and pi-hole/pi-hole#4485) (#2052)
f4469de 
* Replicating changes made by other PRs

(#2031 and pi-hole/pi-hole#4485)

Signed-off-by: rdwebdesign <[email protected]>

* Use the same messages used in #2031

Signed-off-by: rdwebdesign <[email protected]>

* Keep the old responses to avoid break things

Signed-off-by: rdwebdesign <[email protected]>

* More comments less variables

Signed-off-by: rdwebdesign <[email protected]>
This was referenced Jan 13, 2022
Closed
Closed
@sanjeev40084 sanjeev40084 mentioned this pull request Jan 18, 2022
Closed
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-ftl-v5-14-web-v5-11-and-core-v5-9-released/53529/1

This was referenced Feb 12, 2022
Merged
Closed
Merged
Merged
@renovate renovate bot mentioned this pull request Mar 5, 2022
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yubiuser yubiuser yubiuser approved these changes

@PromoFaux PromoFaux Awaiting requested review from PromoFaux

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

api.php status weird behavior?
3 participants
@rdwebdesign @pralor-bot @yubiuser