Make WordPress Core

Opened 6 years ago

Closed 6 years ago

#46028 closed defect (bug) (fixed)

Block Editor: Unable to enable Custom Fields due to out-of-order merges

Reported by: dd32's profile dd32 Owned by: pento's profile pento
Milestone: 5.1 Priority: normal
Severity: normal Version: 5.1
Component: Editor Keywords: has-patch
Focuses: Cc:


After switching from /branches/5.0 to /trunk it appears that we lost the ability to enable Custom Fields.

Upon digging into it(slack) I've realised that two merge commits were done in such a way that a later merge commit brought over an older commit that had been covered by an earlier merge, specifically:

Attachments (1)

46028.diff (1.1 KB) - added by pento 6 years ago.

Download all attachments as: .zip

Change History (5)

6 years ago

#1 @pento
6 years ago

  • Keywords has-patch added

46028.diff fixes it issue for me.

@dd32, how does this look to you?

#2 @dd32
6 years ago

Visual check of 46028.diff looks correct.

Testing on seems right, The option to select Custom Fields is now present within the editor.

Testing on and removing the metabox using the remove_meta_box() example in a mu-plugin has the intended effect of no longer being able to select again.

Looks good to me @pento

This ticket was mentioned in Slack in #meta by dd32. View the logs.

6 years ago

#4 @pento
6 years ago

  • Owner set to pento
  • Resolution set to fixed
  • Status changed from new to closed

In 44648:

Block Editor: Restore the Custom Fields display option.

When merging, [44244] and [44260] were committed to trunk the opposite way that they were committed to the 5.0 branch. They were originally committed in [43885] and [43861], respectively.

Due to this switch, a change in how the Custom Fields meta box was registered wasn't merged from the 5.0 branch, causing it to not be registered correctly in trunk.

Props dd32, pento.
Fixes #46028.

Note: See TracTickets for help on using tickets.