New build

Automattic · Dec 10, 2020 · d0b4c45 · d0b4c45
1 parent c1af608
commit d0b4c45
Show file tree

Hide file tree

Showing 25 changed files with 91 additions and 37 deletions.
diff --git a/_inc/build/instant-search/jp-search.bundle.asset.php b/_inc/build/instant-search/jp-search.bundle.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-i18n', 'wp-polyfill'), 'version' => '5c776e25eb32cf7e159836b709b8cca9');
+<?php return array('dependencies' => array('wp-i18n', 'wp-polyfill'), 'version' => '5e138a2740c4e0d57ffd78b45873cf68');
diff --git a/_inc/build/instant-search/jp-search.bundle.css b/_inc/build/instant-search/jp-search.bundle.css
diff --git a/_inc/build/instant-search/jp-search.bundle.js b/_inc/build/instant-search/jp-search.bundle.js
diff --git a/_inc/build/instant-search/jp-search.bundle.rtl.css b/_inc/build/instant-search/jp-search.bundle.rtl.css
diff --git a/...jp-search.chunk-1-26fd3bc862e3521d00a8.js → ...jp-search.chunk-1-e052740f2f86553f7f9c.js b/...jp-search.chunk-1-26fd3bc862e3521d00a8.js → ...jp-search.chunk-1-e052740f2f86553f7f9c.js
diff --git a/_inc/lib/debugger/class-jetpack-cxn-test-base.php b/_inc/lib/debugger/class-jetpack-cxn-test-base.php
@@ -536,7 +536,10 @@ public function encrypt_string_for_wpcom( $data ) {
 			);
 		}
 
-		openssl_free_key( $public_key );
+		// openssl_free_key was deprecated as no longer needed in PHP 8.0+. Can remove when PHP 8.0 is our minimum. (lol).
+		if ( PHP_VERSION_ID < 80000 ) {
+			openssl_free_key( $public_key ); // phpcs:ignore PHPCompatibility.FunctionUse.RemovedFunctions.openssl_free_keyDeprecated
+		}
 
 		return $return;
 	}

diff --git a/changelog.txt b/changelog.txt
@@ -2,6 +2,21 @@
 
 **This is a list detailing changes for all Jetpack releases.**
 
+= 9.2.1 =
+
+* Release date:  December 10, 2020
+
+**Improved compatibility**
+
+* Site Health Tools: improve PHP 8 compatibility.
+* Twenty Twenty One: add support for Jetpack's Content Options.
+
+**Bug fixes**
+
+* Instant Search: fix layout issues with filtering checkboxes with some themes.
+* WordPress.com Toolbar: avoid Fatal errors when the feature is not active.
+* WordPress.com Toolbar: avoid 404 errors when loading the toolbar.
+
 = 9.2 =
 
 * Release date: December 1, 2020

diff --git a/jetpack.php b/jetpack.php
@@ -4,7 +4,7 @@
  * Plugin URI: https://jetpack.com
  * Description: Bring the power of the WordPress.com cloud to your self-hosted WordPress. Jetpack enables you to connect your blog to a WordPress.com account to use the powerful features normally only available to WordPress.com users.
  * Author: Automattic
- * Version: 9.2
+ * Version: 9.2.1
  * Author URI: https://jetpack.com
  * License: GPL2+
  * Text Domain: jetpack
@@ -16,7 +16,7 @@
 
 define( 'JETPACK__MINIMUM_WP_VERSION', '5.5' );
 define( 'JETPACK__MINIMUM_PHP_VERSION', '5.6' );
-define( 'JETPACK__VERSION', '9.2' );
+define( 'JETPACK__VERSION', '9.2.1' );
 
 /**
  * Constant used to fetch the connection owner token

diff --git a/modules/calypsoify/class.jetpack-calypsoify.php b/modules/calypsoify/class.jetpack-calypsoify.php
@@ -4,6 +4,7 @@
  * Ported from an internal Automattic plugin.
  */
 
+use Automattic\Jetpack\Dashboard_Customizations\Masterbar;
 use Automattic\Jetpack\Redirect;
 use Automattic\Jetpack\Status;
 
@@ -76,8 +77,8 @@ public function admin_color_override( $color ) {
 	}
 
 	public function mock_masterbar_activation() {
-		include_once JETPACK__PLUGIN_DIR . 'modules/masterbar/masterbar.php';
-		new A8C_WPCOM_Masterbar;
+		include_once JETPACK__PLUGIN_DIR . 'modules/masterbar/masterbar/class-masterbar.php';
+		new Masterbar();
 	}
 
 	public function remove_core_menus() {

diff --git a/modules/masterbar/masterbar/class-masterbar.php b/modules/masterbar/masterbar/class-masterbar.php
@@ -288,8 +288,8 @@ public function add_styles_and_scripts() {
 		wp_enqueue_script(
 			'a8c_wpcom_masterbar_tracks_events',
 			Assets::get_file_url_for_environment(
-				'_inc/build/masterbar/tracks-events.min.js',
-				'modules/masterbar/tracks-events.js'
+				'_inc/build/masterbar/masterbar/tracks-events.min.js',
+				'modules/masterbar/masterbar/tracks-events.js'
 			),
 			array( 'jquery' ),
 			JETPACK__VERSION,

diff --git a/modules/theme-tools/compat/twentytwentyone.php b/modules/theme-tools/compat/twentytwentyone.php
@@ -14,6 +14,26 @@ function twentytwentyone_jetpack_setup() {
 	 * Add theme support for geo-location.
 	 */
 	add_theme_support( 'jetpack-geo-location' );
+
+	/**
+	 * Add theme support for Content Options.
+	 */
+	add_theme_support(
+		'jetpack-content-options',
+		array(
+			'blog-display'    => array( 'content', 'excerpt' ),
+			'post-details'    => array(
+				'stylesheet' => 'twenty-twenty-one-style',
+				'date'       => '.posted-on',
+				'categories' => '.cat-links',
+			),
+			'featured-images' => array(
+				'archive' => true,
+				'post'    => true,
+				'page'    => true,
+			),
+		)
+	);
 }
 add_action( 'after_setup_theme', 'twentytwentyone_jetpack_setup' );
 

diff --git a/readme.txt b/readme.txt
@@ -1,7 +1,7 @@
 === Jetpack - WP Security, Backup, Speed, & Growth ===
 Contributors: automattic, adamkheckler, aduth, akirk, allendav, alternatekev, andy, annezazu, apeatling, azaozz, batmoo, barry, beaulebens, biskobe, blobaugh, brbrr, cainm, cena, cfinke, chaselivingston, chellycat, clickysteve, csonnek, danielbachhuber, davoraltman, daniloercoli, delawski, designsimply, dllh, drawmyface, dsmart, dzver, ebinnion, egregor, eliorivero, enej, eoigal, erania-pinnera, ethitter, fgiannar, gcorne, georgestephanis, gibrown, goldsounds, hew, hugobaeta, hypertextranch, iammattthomas, iandunn, jblz, jasmussen, jeffgolenski, jeherve, jenhooks, jenia, jessefriedman, jgs, jkudish, jmdodd, joanrho, johnjamesjacoby, jshreve, kbrownkd, keoshi, koke, kraftbj, lancewillett, leogermani, lschuyler, macmanx, martinremy, matt, matveb, mattwiebe, maverick3x6, mcsf, mdawaffe, mdbitz, MichaelArestad, migueluy, mikeyarce, mkaz, nancythanki, nickmomrik, obenland, oskosk, pento, professor44, rachelsquirrel, rdcoll, ryancowles, richardmuscat, richardmtl, robertbpugh, roccotripaldi, samhotchkiss, scarstocea, scottsweb, sdquirk, sermitr, simison, stephdau, tmoorewp, tyxla, Viper007Bond, westi, yoavf, zinigor
 Tags: WP, backup, social, AMP, WooCommerce, malware, scan, spam, CDN, social
-Stable tag: 9.2
+Stable tag: 9.2.1
 Requires at least: 5.5
 Requires PHP: 5.6
 Tested up to: 5.6
@@ -243,6 +243,21 @@ Our Cookie and Consent Banner can help you comply with GDPR. The European Union
 
 == Changelog ==
 
+= 9.2.1 =
+
+* Release date: December 10, 2020
+
+**Improved compatibility**
+
+* Site Health Tools: improve PHP 8 compatibility.
+* Twenty Twenty One: add support for Jetpack's Content Options.
+
+**Bug fixes**
+
+* Instant Search: fix layout issues with filtering checkboxes with some themes.
+* WordPress.com Toolbar: avoid Fatal errors when the feature is not active.
+* WordPress.com Toolbar: avoid 404 errors when loading the toolbar.
+
 = 9.2 =
 
 * Release date: December 1, 2020

diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit7d7a83344d3b2ded1a3491aa12e59d99::getLoader();
+return ComposerAutoloaderInit2aa52323e0b287da03f99e87bcdacaad::getLoader();
diff --git a/vendor/autoload_packages.php b/vendor/autoload_packages.php
@@ -5,7 +5,7 @@
  * @package automattic/jetpack-autoloader
  */
 
-namespace Automattic\Jetpack\Autoloader\jp7d7a83344d3b2ded1a3491aa12e59d99;
+namespace Automattic\Jetpack\Autoloader\jp2aa52323e0b287da03f99e87bcdacaad;
 
  // phpcs:ignore
 

diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
@@ -19,7 +19,7 @@ class InstalledVersions
     'aliases' => 
     array (
     ),
-    'reference' => '5687756eda3d6efef7b439f432c90abadcb28987',
+    'reference' => '05791160868513583fb03b109b1d6ae9ea513e0c',
     'name' => 'automattic/jetpack',
   ),
   'versions' => 
@@ -31,7 +31,7 @@ class InstalledVersions
       'aliases' => 
       array (
       ),
-      'reference' => '5687756eda3d6efef7b439f432c90abadcb28987',
+      'reference' => '05791160868513583fb03b109b1d6ae9ea513e0c',
     ),
     'automattic/jetpack-a8c-mc-stats' => 
     array (

diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit7d7a83344d3b2ded1a3491aa12e59d99
+class ComposerAutoloaderInit2aa52323e0b287da03f99e87bcdacaad
 {
     private static $loader;
 
@@ -24,15 +24,15 @@ public static function getLoader()
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit7d7a83344d3b2ded1a3491aa12e59d99', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit2aa52323e0b287da03f99e87bcdacaad', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit7d7a83344d3b2ded1a3491aa12e59d99', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit2aa52323e0b287da03f99e87bcdacaad', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit7d7a83344d3b2ded1a3491aa12e59d99::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit2aa52323e0b287da03f99e87bcdacaad::getInitializer($loader));
         } else {
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
@@ -44,19 +44,19 @@ public static function getLoader()
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit7d7a83344d3b2ded1a3491aa12e59d99::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit2aa52323e0b287da03f99e87bcdacaad::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire7d7a83344d3b2ded1a3491aa12e59d99($fileIdentifier, $file);
+            composerRequire2aa52323e0b287da03f99e87bcdacaad($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire7d7a83344d3b2ded1a3491aa12e59d99($fileIdentifier, $file)
+function composerRequire2aa52323e0b287da03f99e87bcdacaad($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit7d7a83344d3b2ded1a3491aa12e59d99
+class ComposerStaticInit2aa52323e0b287da03f99e87bcdacaad
 {
     public static $files = array (
         'bce4ecd6aabb2a2948e06d0e2c4ea9a6' => __DIR__ . '/..' . '/automattic/jetpack-connection/legacy/load-ixr.php',
@@ -148,10 +148,10 @@ class ComposerStaticInit7d7a83344d3b2ded1a3491aa12e59d99
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit7d7a83344d3b2ded1a3491aa12e59d99::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit7d7a83344d3b2ded1a3491aa12e59d99::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit7d7a83344d3b2ded1a3491aa12e59d99::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit7d7a83344d3b2ded1a3491aa12e59d99::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit2aa52323e0b287da03f99e87bcdacaad::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit2aa52323e0b287da03f99e87bcdacaad::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit2aa52323e0b287da03f99e87bcdacaad::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit2aa52323e0b287da03f99e87bcdacaad::$classMap;
 
         }, null, ClassLoader::class);
     }

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -6,7 +6,7 @@
     'aliases' => 
     array (
     ),
-    'reference' => '5687756eda3d6efef7b439f432c90abadcb28987',
+    'reference' => '05791160868513583fb03b109b1d6ae9ea513e0c',
     'name' => 'automattic/jetpack',
   ),
   'versions' => 
@@ -18,7 +18,7 @@
       'aliases' => 
       array (
       ),
-      'reference' => '5687756eda3d6efef7b439f432c90abadcb28987',
+      'reference' => '05791160868513583fb03b109b1d6ae9ea513e0c',
     ),
     'automattic/jetpack-a8c-mc-stats' => 
     array (

diff --git a/vendor/jetpack-autoloader/autoload_functions.php b/vendor/jetpack-autoloader/autoload_functions.php
@@ -5,7 +5,7 @@
  * @package automattic/jetpack-autoloader
  */
 
-namespace Automattic\Jetpack\Autoloader\jp7d7a83344d3b2ded1a3491aa12e59d99;
+namespace Automattic\Jetpack\Autoloader\jp2aa52323e0b287da03f99e87bcdacaad;
 
  // phpcs:ignore
 

diff --git a/vendor/jetpack-autoloader/class-autoloader-handler.php b/vendor/jetpack-autoloader/class-autoloader-handler.php
@@ -5,7 +5,7 @@
  * @package automattic/jetpack-autoloader
  */
 
-namespace Automattic\Jetpack\Autoloader\jp7d7a83344d3b2ded1a3491aa12e59d99;
+namespace Automattic\Jetpack\Autoloader\jp2aa52323e0b287da03f99e87bcdacaad;
 
  // phpcs:ignore
 

diff --git a/vendor/jetpack-autoloader/class-autoloader-locator.php b/vendor/jetpack-autoloader/class-autoloader-locator.php
@@ -5,7 +5,7 @@
  * @package automattic/jetpack-autoloader
  */
 
-namespace Automattic\Jetpack\Autoloader\jp7d7a83344d3b2ded1a3491aa12e59d99;
+namespace Automattic\Jetpack\Autoloader\jp2aa52323e0b287da03f99e87bcdacaad;
 
  // phpcs:ignore
 

diff --git a/vendor/jetpack-autoloader/class-manifest-handler.php b/vendor/jetpack-autoloader/class-manifest-handler.php
@@ -5,7 +5,7 @@
  * @package automattic/jetpack-autoloader
  */
 
-namespace Automattic\Jetpack\Autoloader\jp7d7a83344d3b2ded1a3491aa12e59d99;
+namespace Automattic\Jetpack\Autoloader\jp2aa52323e0b287da03f99e87bcdacaad;
 
  // phpcs:ignore
 

diff --git a/vendor/jetpack-autoloader/class-plugins-handler.php b/vendor/jetpack-autoloader/class-plugins-handler.php
@@ -5,7 +5,7 @@
  * @package automattic/jetpack-autoloader
  */
 
-namespace Automattic\Jetpack\Autoloader\jp7d7a83344d3b2ded1a3491aa12e59d99;
+namespace Automattic\Jetpack\Autoloader\jp2aa52323e0b287da03f99e87bcdacaad;
 
  // phpcs:ignore
 

diff --git a/vendor/jetpack-autoloader/class-version-loader.php b/vendor/jetpack-autoloader/class-version-loader.php
@@ -5,7 +5,7 @@
  * @package automattic/jetpack-autoloader
  */
 
-namespace Automattic\Jetpack\Autoloader\jp7d7a83344d3b2ded1a3491aa12e59d99;
+namespace Automattic\Jetpack\Autoloader\jp2aa52323e0b287da03f99e87bcdacaad;
 
  // phpcs:ignore
 

diff --git a/vendor/jetpack-autoloader/class-version-selector.php b/vendor/jetpack-autoloader/class-version-selector.php
@@ -5,7 +5,7 @@
  * @package automattic/jetpack-autoloader
  */
 
-namespace Automattic\Jetpack\Autoloader\jp7d7a83344d3b2ded1a3491aa12e59d99;
+namespace Automattic\Jetpack\Autoloader\jp2aa52323e0b287da03f99e87bcdacaad;
 
  // phpcs:ignore
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('wp-i18n', 'wp-polyfill'), 'version' => '5c776e25eb32cf7e159836b709b8cca9');
		<?php return array('dependencies' => array('wp-i18n', 'wp-polyfill'), 'version' => '5e138a2740c4e0d57ffd78b45873cf68');
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		require_once __DIR__ . '/composer/autoload_real.php';

		return ComposerAutoloaderInit7d7a83344d3b2ded1a3491aa12e59d99::getLoader();
		return ComposerAutoloaderInit2aa52323e0b287da03f99e87bcdacaad::getLoader();