@automattic/newspack-blocks 4.3.6 → 4.3.7

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [4.3.7](https://github.com/Automattic/newspack-blocks/compare/v4.3.6...v4.3.7) (2024-11-21)
+
+
+### Bug Fixes
+
+* do not invalidate tax queries ([#1968](https://github.com/Automattic/newspack-blocks/issues/1968)) ([a0c1915](https://github.com/Automattic/newspack-blocks/commit/a0c191561e3bd6f16135590e66e5d695f2c3b3d3))
+
 ## [4.3.6](https://github.com/Automattic/newspack-blocks/compare/v4.3.5...v4.3.6) (2024-11-18)
 
 

package/includes/class-newspack-blocks.php

@@ -1290,8 +1290,17 @@ class Newspack_Blocks {
 		$exclude = $exclude['where'];
 		$authors = " ( {$wpdb->posts}.post_author IN ( $csv ) $exclude ) ";
 
-		// Make sure the authors are set, the tax query is valid (doesn't contain 0 = 1).
-		if ( false === strpos( $tax_query['where'], ' 0 = 1' ) ) {
+		/**
+		 * Make sure the authors are set, the tax query is valid (doesn't contain 0 = 1).
+		 *
+		 * Since we have two clauses (one searching on name, and one on slug), it's ok to have a "0 = 1" clause for
+		 * one of them, but not for both.
+		 *
+		 * The reason we might have invalid queries is because we do a broad search with many possibles term slugs and names.
+		 * There is not one consistent way terms are created, so the slug/name can have different values. We try to search for all of them, and
+		 * if none of the options we are searching for exist as a term, it will create an invalid query.
+		 */
+		if ( substr_count( $tax_query['where'], ' 0 = 1' ) <= 1 ) {
 			// Append to the current join parts. The JOIN statment only needs to exist in the clause once.
 			if ( false === strpos( $clauses['join'], $tax_query['join'] ) ) {
 				$clauses['join'] .= '/* newspack-blocks */ ' . $tax_query['join'] . ' /* /newspack-blocks */';

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         4.3.6
+ * Version:         4.3.7
  *
  * @package         Newspack_Blocks
  */
@@ -15,7 +15,7 @@
 define( 'NEWSPACK_BLOCKS__PLUGIN_FILE', __FILE__ );
 define( 'NEWSPACK_BLOCKS__BLOCKS_DIRECTORY', 'dist/' );
 define( 'NEWSPACK_BLOCKS__PLUGIN_DIR', plugin_dir_path( NEWSPACK_BLOCKS__PLUGIN_FILE ) );
-define( 'NEWSPACK_BLOCKS__VERSION', '4.3.6' );
+define( 'NEWSPACK_BLOCKS__VERSION', '4.3.7' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "4.3.6",
+	"version": "4.3.7",
 	"author": "Automattic",
 	"devDependencies": {
 		"@rushstack/eslint-patch": "^1.10.4",

package/vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit709658e8801f92df48c90150e6ddf243::getLoader();
+return ComposerAutoloaderInitc36d9627c62d88af4f121f11954d8390::getLoader();

package/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit709658e8801f92df48c90150e6ddf243
+class ComposerAutoloaderInitc36d9627c62d88af4f121f11954d8390
 {
     private static $loader;
 
@@ -22,12 +22,12 @@ class ComposerAutoloaderInit709658e8801f92df48c90150e6ddf243
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit709658e8801f92df48c90150e6ddf243', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitc36d9627c62d88af4f121f11954d8390', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit709658e8801f92df48c90150e6ddf243', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitc36d9627c62d88af4f121f11954d8390', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit709658e8801f92df48c90150e6ddf243::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitc36d9627c62d88af4f121f11954d8390::getInitializer($loader));
 
         $loader->register(true);
 

package/vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit709658e8801f92df48c90150e6ddf243
+class ComposerStaticInitc36d9627c62d88af4f121f11954d8390
 {
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
@@ -13,7 +13,7 @@ class ComposerStaticInit709658e8801f92df48c90150e6ddf243
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInit709658e8801f92df48c90150e6ddf243::$classMap;
+            $loader->classMap = ComposerStaticInitc36d9627c62d88af4f121f11954d8390::$classMap;
 
         }, null, ClassLoader::class);
     }

package/vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'automattic/newspack-blocks',
         'pretty_version' => 'dev-trunk',
         'version' => 'dev-trunk',
-        'reference' => '2c8c1e6030e6a2b0777ee2756bb2d7196f74fca9',
+        'reference' => 'a0c191561e3bd6f16135590e66e5d695f2c3b3d3',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'automattic/newspack-blocks' => array(
             'pretty_version' => 'dev-trunk',
             'version' => 'dev-trunk',
-            'reference' => '2c8c1e6030e6a2b0777ee2756bb2d7196f74fca9',
+            'reference' => 'a0c191561e3bd6f16135590e66e5d695f2c3b3d3',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),