Merge branch 'fix/cover-repeated-background-localize' of https://github.com/Omcodes23/create-block-theme into fix/cover-repeated-background-localize

om vataliya

Author: Omcodes23

create-block-theme.php

@@ -5,7 +5,7 @@
  * Plugin Name: Create Block Theme
  * Plugin URI: https://wordpress.org/plugins/create-block-theme
  * Description: Generates a block theme
- * Version: 2.7.0
+ * Version: 2.8.0
  * Author: WordPress.org
  * Author URI: https://wordpress.org/
  * License: GNU General Public License v2 or later

includes/create-theme/theme-patterns.php

@@ -29,7 +29,6 @@ public static function pattern_from_wp_block( $pattern_post ) {
 		$pattern->slug         = wp_get_theme()->get( 'TextDomain' ) . '/' . $pattern->name;
 		$pattern_category_list = get_the_terms( $pattern->id, 'wp_pattern_category' );
 		$pattern->categories   = ! empty( $pattern_category_list ) ? join( ', ', wp_list_pluck( $pattern_category_list, 'name' ) ) : '';
-		$pattern->sync_status  = get_post_meta( $pattern->id, 'wp_pattern_sync_status', true );
 		$pattern->content      = <<<PHP
 		<?php
 		/**
@@ -71,7 +70,7 @@ public static function create_pattern_link( $attributes ) {
 		return '<!-- wp:pattern ' . $attributes_json . ' /-->';
 	}
 
-	public static function replace_local_pattern_references( $pattern ) {
+	public static function replace_local_pattern_references( $pattern, $options = null ) {
 		// Find any references to pattern in templates
 		$templates_to_update = array();
 		$args                = array(
@@ -89,7 +88,7 @@ public static function replace_local_pattern_references( $pattern ) {
 		$templates_to_update = array_unique( $templates_to_update );
 
 		// Only update templates that reference the pattern
-		CBT_Theme_Templates::add_templates_to_local( 'all', null, null, null, $templates_to_update );
+		CBT_Theme_Templates::add_templates_to_local( 'all', null, null, $options, $templates_to_update );
 
 		// List all template and pattern files in the theme
 		$base_dir       = get_stylesheet_directory();
@@ -160,41 +159,38 @@ public static function add_patterns_to_theme( $options = null ) {
 				$pattern        = self::prepare_pattern_for_export( $pattern, $options );
 				$pattern_exists = false;
 
-				// Check pattern is synced before adding to theme.
-				if ( 'unsynced' !== $pattern->sync_status ) {
-					// Check pattern name doesn't already exist before creating the file.
-					$existing_patterns = glob( $patterns_dir . DIRECTORY_SEPARATOR . '*.php' );
-					foreach ( $existing_patterns as $existing_pattern ) {
-						if ( strpos( $existing_pattern, $pattern->name . '.php' ) !== false ) {
-							$pattern_exists = true;
-						}
-					}
-
-					if ( $pattern_exists ) {
-						return new WP_Error(
-							'pattern_already_exists',
-							sprintf(
-								/* Translators: Pattern name. */
-								__(
-									'A pattern with this name already exists: "%s".',
-									'create-block-theme'
-								),
-								$pattern->name
-							)
-						);
+				// Check pattern name doesn't already exist before creating the file.
+				$existing_patterns = glob( $patterns_dir . DIRECTORY_SEPARATOR . '*.php' );
+				foreach ( $existing_patterns as $existing_pattern ) {
+					if ( strpos( $existing_pattern, $pattern->name . '.php' ) !== false ) {
+						$pattern_exists = true;
 					}
+				}
 
-					// Create the pattern file.
-					file_put_contents(
-						$patterns_dir . DIRECTORY_SEPARATOR . $pattern->name . '.php',
-						$pattern->content
+				if ( $pattern_exists ) {
+					return new WP_Error(
+						'pattern_already_exists',
+						sprintf(
+							/* Translators: Pattern name. */
+							__(
+								'A pattern with this name already exists: "%s".',
+								'create-block-theme'
+							),
+							$pattern->name
+						)
 					);
+				}
 
-					self::replace_local_pattern_references( $pattern );
+				// Create the pattern file.
+				file_put_contents(
+					$patterns_dir . DIRECTORY_SEPARATOR . $pattern->name . '.php',
+					$pattern->content
+				);
 
-					// Remove it from the database to ensure that these patterns are loaded from the theme.
-					wp_delete_post( $pattern->id, true );
-				}
+				self::replace_local_pattern_references( $pattern, $options );
+
+				// Remove it from the database to ensure that these patterns are loaded from the theme.
+				wp_delete_post( $pattern->id, true );
 			}
 		}
 	}

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-block-theme",
-	"version": "2.7.0",
+	"version": "2.8.0",
 	"private": true,
 	"description": "Create a block-based theme",
 	"author": "The WordPress Contributors",

package.json

@@ -2,8 +2,8 @@
 Contributors: wordpressdotorg, mikachan, onemaggie, pbking, scruffian, mmaattiiaass, jffng, madhudollu, egregor, vcanales, jeffikus, cwhitmore
 Tags: themes, theme, block-theme
 Requires at least: 6.7
-Tested up to: 6.8
-Stable tag: 2.7.0
+Tested up to: 6.9
+Stable tag: 2.8.0
 Requires PHP: 7.4
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -125,6 +125,19 @@ If you are having problems, please try the following:
 
 == Changelog ==
 
+= 2.8.0 =
+* Update "Tested up to" version to 6.9 (#793)
+* Save all patterns (#790)
+* I18n: Makes it possible to translate text strings in HTML comments (#788)
+* Move  and version attributes to the start of the theme.json file as this helps editing in IDEs (#787)
+* Localize Details block summary text (#778)
+* PHPCS: enalbe VariableAnalysis.CodeAnalysis.VariableAnalysis rule (#782)
+* Clean up package.json and update libraries (#781)
+* Bump minimum required WordPress version to 6.7 (#775)
+* Added filters for changing paths (#771)
+* Add option to remove taxonomy query from query block attributes (#734) (#743)
+* Wp-env: remove mappings field (#774)
+
 = 2.7.0 =
 * Update "Tested up to" version to 6.8 (#768)
 * Update wp-env configuration to use 'development mode' and to store themes in an accessible place for development (#764)

readme.txt

@@ -158,9 +158,9 @@ export const SaveThemePanel = () => {
 				/>
 				<CheckboxControl
 					__nextHasNoMarginBottom
-					label={ __( 'Save Synced Patterns', 'create-block-theme' ) }
+					label={ __( 'Save Patterns', 'create-block-theme' ) }
 					help={ __(
-						'Any synced patterns created in the Editor will be moved to the theme. Note that this will delete all synced patterns from the Editor and any references in templates will be made relative to the theme.',
+						'All patterns created in the Editor will be moved to the theme. Note that this will delete all patterns from the Editor and any references in templates will be made relative to the theme.',
 						'create-block-theme'
 					) }
 					checked={ preference.savePatterns }