Merge pull request #1100 from tomusborne/release/1.8.2

Release: 1.8.2
tomusborne · Aug 15, 2023 · 4167592 · 4167592
2 parents 94e2ccd + 46a3338
commit 4167592
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/dist/blocks.asset.php b/dist/blocks.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-notices', 'wp-primitives', 'wp-rich-text'), 'version' => 'c86a2d26cd38afd44e97');
+<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-notices', 'wp-primitives', 'wp-rich-text'), 'version' => 'fda41331ac8ec0795fbf');
diff --git a/dist/blocks.js b/dist/blocks.js
diff --git a/includes/functions.php b/includes/functions.php
@@ -908,7 +908,9 @@ function generateblocks_filter_images( $content, $attributes ) {
 
 	// Add 'loading' attribute if applicable.
 	if ( wp_lazy_loading_enabled( 'img', '' ) && false === strpos( $content, ' loading=' ) ) {
-		$content = wp_img_tag_add_loading_attr( $content, '' );
+		$content = function_exists( 'wp_img_tag_add_loading_optimization_attrs' )
+			? wp_img_tag_add_loading_optimization_attrs( $content, '' )
+			: wp_img_tag_add_loading_attr( $content, '' );
 	}
 
 	return $content;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "generateblocks",
-	"version": "1.8.1",
+	"version": "1.8.2",
 	"private": true,
 	"description": "A small collection of lightweight WordPress blocks that can accomplish nearly anything.",
 	"author": "Tom Usborne",

diff --git a/plugin.php b/plugin.php
@@ -5,7 +5,7 @@
  * Description: A small collection of lightweight WordPress blocks that can accomplish nearly anything.
  * Author: Tom Usborne
  * Author URI: https://tomusborne.com
- * Version: 1.8.1
+ * Version: 1.8.2
  * Requires at least: 5.9
  * Requires PHP: 7.2
  * License: GPL2+
@@ -19,7 +19,7 @@
 	exit; // Exit if accessed directly.
 }
 
-define( 'GENERATEBLOCKS_VERSION', '1.8.1' );
+define( 'GENERATEBLOCKS_VERSION', '1.8.2' );
 define( 'GENERATEBLOCKS_DIR', plugin_dir_path( __FILE__ ) );
 define( 'GENERATEBLOCKS_DIR_URL', plugin_dir_url( __FILE__ ) );
 

diff --git a/readme.txt b/readme.txt
@@ -3,9 +3,9 @@ Contributors: edge22
 Donate link: https://generateblocks.com
 Tags: blocks, gutenberg, container, headline, grid, columns, page builder, wysiwyg, block editor, query, loop, posts
 Requires at least: 5.9
-Tested up to: 6.2
+Tested up to: 6.3
 Requires PHP: 7.2
-Stable tag: 1.8.1
+Stable tag: 1.8.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -83,6 +83,10 @@ GenerateBlocks was built to work hand-in-hand with [GeneratePress](https://gener
 
 == Changelog ==
 
+= 1.8.2 =
+* Fix: Border colors not showing when old attributes are set.
+* Tweak: Add support for the newly created core function "wp_img_tag_add_loading_optimization_attrs"
+
 = 1.8.1 =
 * Fix: Icon padding controls order
 * Fix: Global styles overwriting local attributes

diff --git a/src/extend/inspector-control/controls/borders/index.js b/src/extend/inspector-control/controls/borders/index.js
@@ -189,7 +189,7 @@ export default function Borders( { attributes, setAttributes } ) {
 									} }
 								/>
 
-								{ !! bordersPanel.borderColors.length && 'Desktop' === device && ! attributes.borderColor && ! attributes.borderColorHover && ! attributes.borderColorCurrent &&
+								{ !! bordersPanel.borderColors.length && 'Desktop' === device &&
 									<div className="gblocks-border-colors">
 										{ bordersPanel.borderColors.map( ( borderColor, index ) => {
 											return (
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-notices', 'wp-primitives', 'wp-rich-text'), 'version' => 'c86a2d26cd38afd44e97');
		<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-notices', 'wp-primitives', 'wp-rich-text'), 'version' => 'fda41331ac8ec0795fbf');