Make WordPress Core

Opened 4 years ago

Closed 4 years ago

#57080 closed defect (bug) (fixed)

Add `wp-includes/blocks/comments-query-loop` to `$_old_files`

Reported by: SergeyBiryukov Owned by: desrosj
Priority: normal Milestone: 6.1.1
Component: Upgrade/Install Version: 6.1
Severity: normal Keywords: has-patch commit fixed-major
Cc: Focuses:

Description

As ​noticed by @azaozz on Slack, there is an empty wp-includes/blocks/comments-query-loop​ directory in SVN and in the 6.1 release.

As noted by @jorbin, it looks like the directory was supposed to be deleted in [54257], which removed the block.json file from it, but not the directory itself.

Since the directory was not deleted in that commit, it was also missed from being added to $_old_files in [54730], which included wp-includes/blocks/post-comments, but not wp-includes/blocks/comments-query-loop.

The latter directory should be removed from SVN and added to the array too.

Attachments (1)

57080.diff​ (490 bytes ) - added by SergeyBiryukov 4 years ago.

Download all attachments as: .zip

Change History (6)

@SergeyBiryukov
4 years ago

#1 follow-up: @desrosj
4 years ago

  • Keywords commit added

57080.diff​ looks good to commit to me.

As for including this in 6.1.1, I think that this could be considered a procedural item that we can include without having to create an additional RC.

@SergeyBiryukov what are your thoughts on that?

#2 in reply to: ↑ 1 @SergeyBiryukov
4 years ago

Replying to desrosj:

As for including this in 6.1.1, I think that this could be considered a procedural item that we can include without having to create an additional RC.

Agreed, that's what I was thinking too.

#3 @desrosj
4 years ago

  • Owner set to desrosj
  • Resolution → fixed
  • Status new → closed

In 54836:

Upgrade/Install: Delete the comments-query-loop folder in wp-includes/blocks.

This properly deletes the now empty src/wp-includes/blocks/comments-query-loop directory and adds that directory to the $_old_files array.

The files in this directory were removed in [54257], but the directory was not marked as deleted in SVN.

Props azaozz, jorbin, SergeyBiryukov.
Fixes #57080.

#4 @desrosj
4 years ago

  • Keywords fixed-major added
  • Resolution fixed
  • Status closed → reopened

Reopening to backport.

#5 @desrosj
4 years ago

  • Resolution → fixed
  • Status reopened → closed

In 54837:

Upgrade/Install: Delete the comments-query-loop folder in wp-includes/blocks.

This properly deletes the now empty src/wp-includes/blocks/comments-query-loop directory and adds that directory to the $_old_files array.

The files in this directory were removed in [54257], but the directory was not marked as deleted in SVN.

Props azaozz, jorbin, SergeyBiryukov.
Merges [54836] to the 6.1 branch.
Fixes #57080.

Note: See TracTickets for help on using tickets.