Merge pull request #1377 from publishpress/release-3.2.2

Release 3.2.2
publishpress · May 13, 2024 · 9ef1833 · 9ef1833
2 parents e5c71de + 464dca9
commit 9ef1833
Show file tree

Hide file tree

Showing 14 changed files with 4,431 additions and 21,667 deletions.
diff --git a/.github/ISSUE_TEMPLATE/release-pro-plugin.md b/.github/ISSUE_TEMPLATE/release-pro-plugin.md
@@ -24,7 +24,7 @@ To release the Pro plugin, ensure you complete all the tasks below.
 - [ ] Update the JavaScript translations by executing `composer build:js-translations`.
 - [ ] Especially for minor and patch releases, maintain backward compatibility for changes like renamed or moved classes, namespaces, functions, etc. Include deprecation comments and mention this in the changelog. Major releases may remove deprecated code, but always note this in the changelog.
 - [ ] Revise the changelog to include all changes with user-friendly descriptions and ensure the release date is accurate.
--- [ ] Update the version number in the main plugin file and `readme.txt`, adhering to specifications from our [tech documentation](https://rambleventures.slab.com/posts/version-numbers-58nmrk4b), and commit to the release branch.
+- [ ] Update the version number in the main plugin file and `readme.txt`, adhering to specifications from our [tech documentation](https://rambleventures.slab.com/posts/version-numbers-58nmrk4b), and commit to the release branch.
 - [ ] Confirm there are no uncommitted changes.
 - [ ] Build the zip package with `composer build`, creating a new package in the `./dist` directory.
 - [ ] Distribute the new package to the team for testing.

diff --git a/advanced-gutenberg.php b/advanced-gutenberg.php
@@ -3,7 +3,7 @@
  * Plugin Name: PublishPress Blocks
  * Plugin URI: https://publishpress.com/blocks/
  * Description: PublishPress Blocks has everything you need to build professional websites with the Gutenberg editor.
- * Version: 3.2.1
+ * Version: 3.2.2
  * Author: PublishPress
  * Author URI: https://publishpress.com/
  * Text Domain: advanced-gutenberg
@@ -71,7 +71,7 @@
 	define( 'ADVANCED_GUTENBERG_LOADED', true );
 
 	if ( ! defined( 'ADVANCED_GUTENBERG_VERSION' ) ) {
-		define( 'ADVANCED_GUTENBERG_VERSION', '3.2.1' );
+		define( 'ADVANCED_GUTENBERG_VERSION', '3.2.2' );
 	}
 
 	if ( ! defined( 'ADVANCED_GUTENBERG_PLUGIN' ) ) {

diff --git a/assets/blocks/recent-posts/block.php b/assets/blocks/recent-posts/block.php
@@ -1126,7 +1126,7 @@ function advgbGetSeriesOrder( $post ) {
         // Get the terms array from a post so later we can get the term id
         $terms = wp_get_post_terms( $post['id'], 'series' );
 
-        if( count( $terms ) && $terms[0]->term_id ) {
+        if( is_array( $terms ) && count( $terms ) && $terms[0]->term_id ) {
             return (int) get_post_meta( $post['id'], '_series_part_' . $terms[0]->term_id, true );
         }
     } else {

diff --git a/composer.json b/composer.json
@@ -35,6 +35,12 @@
         "build:clean": "ppbuild clean",
         "build:make-pot": "wp i18n make-pot --exclude=/dev-workspace --exclude=/.wordpress-org --exclude=/.github --exclude=/dist --exclude=/vendor --exclude=/lib . ./languages/advanced-gutenberg.pot --allow-root",
         "build:js-translations": "json_translations.sh",
+        "build:css": "sass assets/scss/:assets/css/ --style=compressed",
+        "build:css-dev": "sass assets/scss/:assets/css/ -w",
+        "build:js-dev": "webpack --mode development --watch",
+        "build:js": "webpack --mode production",
+        "minify:js-main": "uglifyjs assets/js/main.js --output assets/js/main.min.js",
+        "minify:js-settings": "uglifyjs assets/js/settings.js --output assets/js/settings.min.js",
         "get-version": "ppbuild version",
         "check:longpath": "longpath .",
         "check:phpcs": "vendor/bin/phpcs --standard=WordPress-VIP-Go ./ --severity=6 --ignore=vendor,dist,node_modules || true",

diff --git a/composer.lock b/composer.lock
diff --git a/incl/advanced-gutenberg-main.php b/incl/advanced-gutenberg-main.php
@@ -3705,7 +3705,7 @@ public function buildTabs( $page, $active, $tabs ) {
 			foreach ( $tabs as $tab ) {
 				$html .= '<li class="nav-tab' . ( $tab['slug'] === $active ? ' nav-tab-active' : '' ) . '">
                     <a href="' . admin_url( 'admin.php?page=' . $page . '&tab=' . $tab['slug'] ) . '">
-                        ' . $tab['title'] . '
+                        ' . esc_html( $tab['title'] ) . '
                     </a>
                 </li>';
 			}

diff --git a/incl/pages/block-controls.php b/incl/pages/block-controls.php
@@ -34,11 +34,11 @@
     <?php
     $tabs = [
         [
-            'title' => __( 'Controls', 'advanced-gutenberg' ),
+            'title' => esc_html__( 'Controls', 'advanced-gutenberg' ),
             'slug' => 'controls'
         ],
         [
-            'title' => __( 'Blocks', 'advanced-gutenberg' ),
+            'title' => esc_html__( 'Blocks', 'advanced-gutenberg' ),
             'slug' => 'blocks'
         ]
     ];

diff --git a/incl/pages/settings.php b/incl/pages/settings.php
@@ -26,7 +26,7 @@
     <?php
     $tabs = [
         [
-            'title' => __( 'General', 'advanced-gutenberg' ),
+            'title' => esc_html__( 'General', 'advanced-gutenberg' ),
             'slug' => 'general'
         ]
     ];
@@ -35,23 +35,23 @@
         array_push(
             $tabs,
             [
-                'title' => __( 'Images', 'advanced-gutenberg' ),
+                'title' => esc_html__( 'Images', 'advanced-gutenberg' ),
                 'slug' => 'images'
             ],
             [
-                'title' => __( 'Maps', 'advanced-gutenberg' ),
+                'title' => esc_html__( 'Maps', 'advanced-gutenberg' ),
                 'slug' => 'maps'
             ],
             [
-                'title' => __( 'Email & Forms', 'advanced-gutenberg' ),
+                'title' => esc_html__( 'Email & Forms', 'advanced-gutenberg' ),
                 'slug' => 'forms'
             ],
             [
-                'title' => __( 'reCAPTCHA', 'advanced-gutenberg' ),
+                'title' => esc_html__( 'reCAPTCHA', 'advanced-gutenberg' ),
                 'slug' => 'recaptcha'
             ],
             [
-                'title' => __( 'Data Export', 'advanced-gutenberg' ),
+                'title' => esc_html__( 'Data Export', 'advanced-gutenberg' ),
                 'slug' => 'data'
             ]
         );
@@ -61,7 +61,7 @@
         array_push(
             $tabs,
             [
-                'title' => __( 'License', 'advanced-gutenberg' ),
+                'title' => esc_html__( 'License', 'advanced-gutenberg' ),
                 'slug' => 'license'
             ]
         );