From 6d207771d377932a574d6bc698ff150045c5ca84 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 21 Jul 2020 13:15:05 +0000
Subject: [PATCH] Block Editor: Move the `add_action()` call for
 `_register_core_block_patterns_and_categories()` to
 `wp-includes/default-filters.php`.

Follow-up to [48492].

Props desrosj.
Fixes #50669.
Built from https://develop.svn.wordpress.org/trunk@48531


git-svn-id: http://core.svn.wordpress.org/trunk@48293 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/block-patterns.php  | 2 --
 wp-includes/default-filters.php | 1 +
 wp-includes/version.php         | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/wp-includes/block-patterns.php b/wp-includes/block-patterns.php
index 6efc56fee7..29e6298d27 100644
--- a/wp-includes/block-patterns.php
+++ b/wp-includes/block-patterns.php
@@ -44,5 +44,3 @@ function _register_core_block_patterns_and_categories() {
 	register_block_pattern_category( 'header', array( 'label' => _x( 'Headers', 'Block pattern category' ) ) );
 	register_block_pattern_category( 'text', array( 'label' => _x( 'Text', 'Block pattern category' ) ) );
 }
-
-add_action( 'init', '_register_core_block_patterns_and_categories' );
diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index dc51908604..715d9fe8ce 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -302,6 +302,7 @@ add_action( 'wp_footer', 'wp_print_footer_scripts', 20 );
 add_action( 'template_redirect', 'wp_shortlink_header', 11, 0 );
 add_action( 'wp_print_footer_scripts', '_wp_footer_scripts' );
 add_action( 'init', 'check_theme_switched', 99 );
+add_action( 'init', '_register_core_block_patterns_and_categories' );
 add_action( 'after_switch_theme', '_wp_menus_changed' );
 add_action( 'after_switch_theme', '_wp_sidebars_changed' );
 add_action( 'wp_print_styles', 'print_emoji_styles' );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f51577d9a3..201b43246a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-beta2-48530';
+$wp_version = '5.5-beta2-48531';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.