Changeset 13717

Timestamp:

05/16/2024 06:47:51 AM (18 months ago)

Author:

dd32

Message:

Plugin Directory: Blocks: Don't be greedy in the regex. Fixes multiple block registrations close together merging together.

See [13716].

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php

@@ -1011 +1011 @@
             // Note that this only works with literal strings for the block name and title, and assumes that order.
             $contents = file_get_contents( $filename );
-            if ( $contents && preg_match_all( "#registerBlockType[^{}]{0,500}[(]\s*[\"']([-\w]+/[-\w]+)[\"']\s*,\s*[{][^;]{0,500}\s*title\s*:[\s\w(.]*[\"']([^\"']*)[\"'](?!\s*[+])#ms", $contents, $matches, PREG_SET_ORDER ) ) {
+            if ( $contents && preg_match_all( "#registerBlockType[^{}]{0,500}[(]\s*[\"']([-\w]+/[-\w]+)[\"']\s*,\s*[{][^;]{0,500}?\s*title\s*:[\s\w(.]*[\"']([^\"']*)[\"'](?!\s*[+])#ms", $contents, $matches, PREG_SET_ORDER ) ) {
                 foreach ( $matches as $match ) {
                     $blocks[] = (object) [