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.

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

WP-r44338: Correctly show post type hierarchy in admin #333

Merged
merged 1 commit into from Jan 28, 2019

Conversation

Projects
None yet
3 participants
@Mte90
Copy link
Collaborator

Mte90 commented Jan 15, 2019

…ierarchy in admin.

In [44185], a bug was introduced where hierarchical post types would not display in the correct default order (hierarchically).

This was caused by a ! isset() check, which returned false after [44185], causing the correct default value to not be applied. This switches that conditional to use an empty() check, ignoring the new empty string assignment that was added to prevent a PHP notice when compact() is called.

Props davidbinda.
Fixes #45711.

git-svn-id: https://develop.svn.wordpress.org/trunk@44338 602fd350-edb4-49c9-b593-d223f7449a82


Merges https://core.trac.wordpress.org/changeset/44338 / WordPress/wordpress-develop@47584c7 to ClassicPress.

@Mte90 Mte90 referenced this pull request Jan 15, 2019

Closed

Integrate patch from 5.0.2 #301

@nylen

This comment has been minimized.

Copy link
Member

nylen commented Jan 16, 2019

This PR is looking much better, thank you!

We haven't merged https://core.trac.wordpress.org/changeset/44185 yet, and this changeset comes after that one. Let's do https://core.trac.wordpress.org/changeset/44185 first.

@nylen

This comment has been minimized.

Copy link
Member

nylen commented Jan 16, 2019

Actually the SVN changeset number here is incorrect:

Merges https://core.trac.wordpress.org/changeset/44185 / WordPress/wordpress-develop@47584c7 to ClassicPress.

The correct changeset number would be 44338.

Looks like you need to update your script to match revision IDs more exactly.

@Mte90

This comment has been minimized.

Copy link
Collaborator Author

Mte90 commented Jan 16, 2019

fixed the script, I have to see about how to change the commit text

@nylen

This comment has been minimized.

Copy link
Member

nylen commented Jan 16, 2019

This PR can't be merged as-is, regardless of what the commit messages say.

We haven't merged https://core.trac.wordpress.org/changeset/44185 yet, and this changeset comes after that one. Let's do https://core.trac.wordpress.org/changeset/44185 first.

@Mte90 Mte90 force-pushed the Mte90:merge/wp-r45711 branch from 4fc7d22 to b6df688 Jan 16, 2019

@Mte90

This comment has been minimized.

Copy link
Collaborator Author

Mte90 commented Jan 16, 2019

I fixed the commit text and in the pr
Anyway yes this pr depends to the other one.

@Mte90 Mte90 referenced this pull request Jan 16, 2019

Merged

Backport scripts #335

WP-r44338: Posts, Post Types: Correctly show hierarchical post type h…
…ierarchy in admin.

In https://core.trac.wordpress.org/changeset/44185, a bug was introduced where hierarchical post types would not display in the correct default order (hierarchically).

This was caused by a `! isset()` check, which returned `false` after https://core.trac.wordpress.org/changeset/44185, causing the correct default value to not be applied. This switches that conditional to use an `empty()` check, ignoring the new empty string assignment that was added to prevent a PHP notice when `compact()` is called.

WP:Props davidbinda.
Fixes https://core.trac.wordpress.org/ticket/45711.

Conflicts:
  src/wp-admin/includes/post.php
----
Merges https://core.trac.wordpress.org/changeset/44338 / WordPress/wordpress-develop@47584c7 to ClassicPress.

@Mte90 Mte90 force-pushed the Mte90:merge/wp-r45711 branch from b6df688 to 5f4570b Jan 28, 2019

@Mte90

This comment has been minimized.

Copy link
Collaborator Author

Mte90 commented Jan 28, 2019

also this one with the new script

@nylen

nylen approved these changes Jan 28, 2019

Copy link
Member

nylen left a comment

Thanks!

@nylen nylen changed the title #WP-45711: Posts, Post Types: Correctly show hierarchical post type h… WP-r44338: Correctly show post type hierarchy in admin Jan 28, 2019

@nylen nylen merged commit 5ba06a7 into ClassicPress:develop Jan 28, 2019

1 check passed

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