Changeset 53405 for branches/6.0/src/wp-includes/class-wp-block-patterns-registry.php

Timestamp:

05/17/2022 03:41:28 PM (4 years ago)

Author:

gziolo

Message:

Editor: Update WordPress packages for 6.0 RC 3

[53402] Theme: Use a better method to determine the theme name during export

[53403] Editor: Update WordPress packages for 6.0 RC 3

[53404] Editor: Return additional block patterns to server-generated settings

Props SergeyBiryukov, scruffian, davidbaumwald, jeremyfelt, zieladam, ndiego, jsnajdr, peterwilsoncc, johnstonphilip.
Merges [53402], [53403] and [53404] to the 6.0 branch.
Fixes #55567.

Location:

branches/6.0

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-block-patterns-registry.php (modified) (4 diffs)

branches/6.0/src/wp-includes/class-wp-block-patterns-registry.php

@@ -21 +21 @@
          */
         private $registered_patterns = array();
+
+        /**
+         * Patterns registered outside the `init` action.
+         *
+         * @since 6.0.0
+         * @var array[]
+         */
+        private $registered_patterns_outside_init = array();
 
         /**
@@ -93 +101 @@
                 }
 
-                $this->registered_patterns[ $pattern_name ] = array_merge(
+                $pattern = array_merge(
                         $pattern_properties,
                         array( 'name' => $pattern_name )
                 );
+                $this->registered_patterns[ $pattern_name ] = $pattern;
+
+                // If the pattern is registered inside an action other than `init`, store it
+                // also to a dedicated array. Used to detect deprecated registrations inside
+                // `admin_init` or `current_screen`.
+                if ( current_action() && 'init' !== current_action() ) {
+                        $this->registered_patterns_outside_init[ $pattern_name ] = $pattern;
+                }
 
                 return true;
@@ -121 +137 @@
 
                 unset( $this->registered_patterns[ $pattern_name ] );
+                unset( $this->registered_patterns_outside_init[ $pattern_name ] );
 
                 return true;
@@ -146 +163 @@
          * @since 5.5.0
          *
+         * @param bool $outside_init_only Return only patterns registered outside the `init` action.
          * @return array[] Array of arrays containing the registered block patterns properties,
          *                 and per style.
          */
-        public function get_all_registered() {
-                return array_values( $this->registered_patterns );
+        public function get_all_registered( $outside_init_only = false ) {
+                return array_values(
+                        $outside_init_only
+                                ? $this->registered_patterns_outside_init
+                                : $this->registered_patterns
+                );
         }