Preparing for version 0.3.1.

tainacan · Mar 4, 2024 · bb475fd · bb475fd
1 parent 6a725ad
commit bb475fd
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
+tainacan-blocksy/node_modules
 tainacan-blocksy/*/node_modules
 .vscode
diff --git a/tainacan-blocksy/.gitignore b/tainacan-blocksy/.gitignore
diff --git a/tainacan-blocksy/README.txt b/tainacan-blocksy/README.txt
@@ -1,11 +1,12 @@
 === Tainacan Support for Blocksy ===
 Author: tainacan
 Contributors: wetah, vnmedeiros, leogermani, tainacan
-Tags: museums, libraries, archives, GLAM, collections, repository, tainacan, blocksy
+Tags: museums, archives, collections, tainacan, blocksy
 Requires at least: 5.9
 Tested up to: 6.4.1
 Requires PHP: 7.0
-Stable tag: 0.3.0
+Stable tag: 0.3.1
+Requires Plugins: tainacan
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -58,6 +59,9 @@ License details: https://github.com/tainacan/blocksy-tainacan/blob/master/LICENS
 
 == Changelog ==
 
+= 0.3.1 =
+* Fixes customizer errors due to Blocksy changes in version 2.0.27
+
 = 0.3.0 =
 * Adds page title default Blocksy banner options for Collection Items templates
 * Adds page title section options to Repository and Taxonomy Term Items level templates

diff --git a/tainacan-blocksy/functions.php b/tainacan-blocksy/functions.php
@@ -4,7 +4,7 @@
 Plugin URI: https://tainacan.org/
 Description: Tainacan plugin support for Blocksy theme
 Author: tainacan
-Version: 0.3.0
+Version: 0.3.1
 Text Domain: tainacan-blocksy
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -15,7 +15,7 @@
 }
 
 /** Theme/plugin version */
-const TAINACAN_BLOCKSY_VERSION = '0.3.0';
+const TAINACAN_BLOCKSY_VERSION = '0.3.1';
 const TAINACAN_BLOCKSY_IS_CHILD_THEME = false;
 
 /* Tools to define our next constants */

diff --git a/tainacan-blocksy/inc/enqueues.php b/tainacan-blocksy/inc/enqueues.php
@@ -22,6 +22,7 @@ function tainacan_blocksy_enqueue_scripts() {
 	if ( $blocksy_theme_version > '1.9' ) {
 		wp_enqueue_style( 'tainacan-blocksy-compatibility-style',
 			TAINACAN_BLOCKSY_PLUGIN_URL_PATH . '/compat.min.css',
+			array(),
 			TAINACAN_BLOCKSY_VERSION
 		);
 	}

diff --git a/tainacan-blocksy/inc/integration.php b/tainacan-blocksy/inc/integration.php
@@ -133,7 +133,7 @@ function tainacan_blocksy_render_media_gallery_above_title() {
         $media_component_style .= '--tainacan-media-color:' . $media_component_color_palette['color2']['color'] . ';';
         $media_component_style .= '--tainacan-media-accent-color:' . $media_component_color_palette['color3']['color'] . ';';
 
-        echo '<div class="tainacan-gallery-above-title ' . $extra_classes . '" style="' . $media_component_style . '">';
+        echo '<div class="tainacan-gallery-above-title ' . esc_attr($extra_classes) . '" style="' . esc_attr($media_component_style) . '">';
             tainacan_blocksy_get_template_part( 'template-parts/tainacan-item-single-document' );
             do_action( 'tainacan-blocksy-single-item-after-document' );  
 

diff --git a/tainacan-blocksy/inc/navigation.php b/tainacan-blocksy/inc/navigation.php
@@ -266,7 +266,7 @@ function blocksy_default_post_navigation() {
 		ob_start();
 
 		?>
-			<nav class="<?php echo esc_attr( $container_class ); ?>" <?php if (function_exists('blocksy_generic_get_deep_link') ) echo blocksy_generic_get_deep_link($deep_link_args); ?>>
+			<nav class="<?php echo esc_attr( $container_class ); ?>" <?php if (function_exists('blocksy_generic_get_deep_link') ) echo esc_attr(blocksy_generic_get_deep_link($deep_link_args)); ?>>
 				<?php if ($next_post): ?>
 					<a href="<?php echo esc_url(get_permalink($next_post)); ?>" class="nav-item-prev">
 						<?php if ($has_thumb): ?>
@@ -513,7 +513,7 @@ function tainacan_blocksy_custom_breadcrumbs( $array ) {
 						isset($args['ref']) &&
 						substr($array[$i]['url'], -strlen($args['ref']))===$args['ref']
 					) {
-						$ref = $args['ref'];
+						$ref = esc_js($args['ref']);
 						unset($args['pos']);
 						unset($args['ref']);
 						unset($args['source_list']);

diff --git a/tainacan-blocksy/package-lock.json b/tainacan-blocksy/package-lock.json
diff --git a/tainacan-blocksy/package.json b/tainacan-blocksy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tainacan-blocksy",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "A Blocksy plugin/child theme compatible with Tainacan",
   "main": "index.js",
   "scripts": {

diff --git a/tainacan-blocksy/template-parts/tainacan-item-single-attachments_new.php b/tainacan-blocksy/template-parts/tainacan-item-single-attachments_new.php
@@ -48,7 +48,7 @@
 
     if ( function_exists('tainacan_the_media_component') && ( !empty( $attachments ) || ( $is_gallery_mode && tainacan_has_document() ) ) ) {
     ?>
-        <section class="tainacan-item-section tainacan-item-section--<?php echo ( !$is_gallery_mode ? 'attachments' : ( 'gallery tainacan-media-component-wrapper-thumbnails-at--' . $gallery_position . ' tainacan-media-component-wrapper-spacing--' . $gallery_spacing) ) ?>">
+        <section class="tainacan-item-section tainacan-item-section--<?php echo esc_attr( !$is_gallery_mode ? 'attachments' : ( 'gallery tainacan-media-component-wrapper-thumbnails-at--' . $gallery_position . ' tainacan-media-component-wrapper-spacing--' . $gallery_spacing) ) ?>">
 
             <?php if ( $page_structure_type !== 'type-gtm' && (get_theme_mod($prefix . '_display_section_labels', 'yes') == 'yes') && (!$is_gallery_mode) && get_theme_mod($prefix . '_section_attachments_label', __( 'Attachments', 'tainacan-blocksy' )) != '' ) : ?>
                 <h2 class="tainacan-single-item-section" id="tainacan-item-attachments-label">

diff --git a/tainacan-blocksy/template-parts/tainacan-item-single-document_new.php b/tainacan-blocksy/template-parts/tainacan-item-single-document_new.php
@@ -30,7 +30,7 @@
     global $post;
 
     if ( tainacan_has_document() && !$is_gallery_mode ) : ?>
-        <section class="tainacan-item-section tainacan-item-section--document <?php echo ' tainacan-media-component-wrapper-spacing--' . $gallery_spacing ?>">
+        <section class="tainacan-item-section tainacan-item-section--document <?php echo esc_attr(' tainacan-media-component-wrapper-spacing--' . $gallery_spacing ) ?>">
             <?php if ( $page_structure_type !== 'type-gtm' && get_theme_mod($prefix . '_display_section_labels', 'yes') == 'yes' && get_theme_mod($prefix . '_section_document_label', __( 'Document', 'tainacan-blocksy' )) != '' ) : ?>
                 <h2 class="tainacan-single-item-section" id="tainacan-item-document-label">
                     <?php echo esc_html( get_theme_mod($prefix . '_section_document_label', __( 'Document', 'tainacan-blocksy' ) ) ); ?>

diff --git a/tainacan-blocksy/template-parts/tainacan-item-single-metadata_new.php b/tainacan-blocksy/template-parts/tainacan-item-single-metadata_new.php
@@ -24,7 +24,7 @@
             ob_start();
             ?>
                 <div class="tainacan-item-section__metadata-thumbnail">
-                    <h3 class="tainacan-metadata-label"><?php _e( 'Thumbnail', 'tainacan-blocksy' ); ?></h3>
+                    <h3 class="tainacan-metadata-label"><?php esc_html_e( 'Thumbnail', 'tainacan-blocksy' ); ?></h3>
                     <p class="tainacan-metadata-value"><?php the_post_thumbnail('tainacan-medium-full'); ?></p>
                 </div>
             <?php