Skip to content

Repair Tool: Compare filterable/cachable queries with direct DB queries before editing config #7589

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

Open
pdclark wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Repair Tool: Compare filterable/cachable queries with direct DB queries before editing config #7589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests-plugin-checker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v6

- name: Run plugin check
uses: wordpress/plugin-check-action@v1
Expand Down
5 changes: 4 additions & 1 deletion classes/PodsAdmin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2447,7 +2447,10 @@ public function maybe_migrate_pod_fields_into_group( $pod ) {

$results = $tool->repair_groups_and_fields_for_pod( $pod, 'upgrade' );

if ( '' !== $results['message_html'] ) {
if ( ! empty( $results['conflicts'] ) ) {
// Always show the conflict, refreshing the page would hide why the Pod was not migrated.
pods_message( $results['message_html'], 'error' );
} elseif ( '' !== $results['message_html'] ) {
if ( 'pods' === pods_v( 'page' ) && 'edit' === pods_v( 'action' ) && 'create' === pods_v( 'do' ) ) {
// Refresh the page if we just added the Pod.
pods_redirect();
Expand Down
73 changes: 72 additions & 1 deletion src/Pods/Tools/Base.php
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions src/Pods/Tools/Conflict_Exception.php
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading