This commit is contained in:
root 2020-12-17 13:35:39 +00:00
parent 1c68e964e6
commit f1debe2f30
26 changed files with 93 additions and 39 deletions

View File

@ -1 +1 @@
<?php return array('dependencies' => array('wp-i18n', 'wp-polyfill'), 'version' => '5c776e25eb32cf7e159836b709b8cca9'); <?php return array('dependencies' => array('wp-i18n', 'wp-polyfill'), 'version' => '5e138a2740c4e0d57ffd78b45873cf68');

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -536,7 +536,10 @@ class Jetpack_Cxn_Test_Base {
); );
} }
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; return $return;
} }

View File

@ -2,6 +2,21 @@
**This is a list detailing changes for all Jetpack releases.** **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 = = 9.2 =
* Release date: December 1, 2020 * Release date: December 1, 2020

View File

@ -4,7 +4,7 @@
* Plugin URI: https://jetpack.com * 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. * 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 * Author: Automattic
* Version: 9.2 * Version: 9.2.1
* Author URI: https://jetpack.com * Author URI: https://jetpack.com
* License: GPL2+ * License: GPL2+
* Text Domain: jetpack * Text Domain: jetpack
@ -16,7 +16,7 @@
define( 'JETPACK__MINIMUM_WP_VERSION', '5.5' ); define( 'JETPACK__MINIMUM_WP_VERSION', '5.5' );
define( 'JETPACK__MINIMUM_PHP_VERSION', '5.6' ); 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 * Constant used to fetch the connection owner token

View File

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

View File

@ -288,8 +288,8 @@ class Masterbar {
wp_enqueue_script( wp_enqueue_script(
'a8c_wpcom_masterbar_tracks_events', 'a8c_wpcom_masterbar_tracks_events',
Assets::get_file_url_for_environment( Assets::get_file_url_for_environment(
'_inc/build/masterbar/tracks-events.min.js', '_inc/build/masterbar/masterbar/tracks-events.min.js',
'modules/masterbar/tracks-events.js' 'modules/masterbar/masterbar/tracks-events.js'
), ),
array( 'jquery' ), array( 'jquery' ),
JETPACK__VERSION, JETPACK__VERSION,

View File

@ -183,8 +183,8 @@ $assets = array (
178 => '_inc/build/custom-post-types/js/nova-drag-drop.min.js', 178 => '_inc/build/custom-post-types/js/nova-drag-drop.min.js',
179 => '_inc/build/custom-post-types/js/many-items.min.js', 179 => '_inc/build/custom-post-types/js/many-items.min.js',
180 => '_inc/build/custom-post-types/js/menu-checkboxes.min.js', 180 => '_inc/build/custom-post-types/js/menu-checkboxes.min.js',
181 => '_inc/build/instant-search/jp-search.chunk-1-26fd3bc862e3521d00a8.js', 181 => '_inc/build/instant-search/jp-search.bundle.js',
182 => '_inc/build/instant-search/jp-search.bundle.js', 182 => '_inc/build/instant-search/jp-search.chunk-1-e052740f2f86553f7f9c.js',
183 => '_inc/build/instant-search/jp-search.bundle.rtl.css', 183 => '_inc/build/instant-search/jp-search.bundle.rtl.css',
184 => '_inc/build/instant-search/jp-search.bundle.css', 184 => '_inc/build/instant-search/jp-search.bundle.css',
185 => '_inc/build/jquery.jetpack-resize.min.js', 185 => '_inc/build/jquery.jetpack-resize.min.js',

View File

@ -14,6 +14,26 @@ function twentytwentyone_jetpack_setup() {
* Add theme support for geo-location. * Add theme support for geo-location.
*/ */
add_theme_support( 'jetpack-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' ); add_action( 'after_setup_theme', 'twentytwentyone_jetpack_setup' );

View File

@ -1,7 +1,7 @@
=== Jetpack - WP Security, Backup, Speed, & Growth === === 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 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 Tags: WP, backup, social, AMP, WooCommerce, malware, scan, spam, CDN, social
Stable tag: 9.1 Stable tag: 9.2.1
Requires at least: 5.5 Requires at least: 5.5
Requires PHP: 5.6 Requires PHP: 5.6
Tested up to: 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 == == 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 = = 9.2 =
* Release date: December 1, 2020 * Release date: December 1, 2020

View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php'; require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit7d7a83344d3b2ded1a3491aa12e59d99::getLoader(); return ComposerAutoloaderInit2aa52323e0b287da03f99e87bcdacaad::getLoader();

View File

@ -5,7 +5,7 @@
* @package automattic/jetpack-autoloader * @package automattic/jetpack-autoloader
*/ */
namespace Automattic\Jetpack\Autoloader\jp7d7a83344d3b2ded1a3491aa12e59d99; namespace Automattic\Jetpack\Autoloader\jp2aa52323e0b287da03f99e87bcdacaad;
// phpcs:ignore // phpcs:ignore

View File

@ -19,7 +19,7 @@ private static $installed = array (
'aliases' => 'aliases' =>
array ( array (
), ),
'reference' => '5687756eda3d6efef7b439f432c90abadcb28987', 'reference' => '05791160868513583fb03b109b1d6ae9ea513e0c',
'name' => 'automattic/jetpack', 'name' => 'automattic/jetpack',
), ),
'versions' => 'versions' =>
@ -31,7 +31,7 @@ private static $installed = array (
'aliases' => 'aliases' =>
array ( array (
), ),
'reference' => '5687756eda3d6efef7b439f432c90abadcb28987', 'reference' => '05791160868513583fb03b109b1d6ae9ea513e0c',
), ),
'automattic/jetpack-a8c-mc-stats' => 'automattic/jetpack-a8c-mc-stats' =>
array ( array (

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer // autoload_real.php @generated by Composer
class ComposerAutoloaderInit7d7a83344d3b2ded1a3491aa12e59d99 class ComposerAutoloaderInit2aa52323e0b287da03f99e87bcdacaad
{ {
private static $loader; private static $loader;
@ -24,15 +24,15 @@ class ComposerAutoloaderInit7d7a83344d3b2ded1a3491aa12e59d99
require __DIR__ . '/platform_check.php'; 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(); 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()); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) { if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php'; require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit7d7a83344d3b2ded1a3491aa12e59d99::getInitializer($loader)); call_user_func(\Composer\Autoload\ComposerStaticInit2aa52323e0b287da03f99e87bcdacaad::getInitializer($loader));
} else { } else {
$classMap = require __DIR__ . '/autoload_classmap.php'; $classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) { if ($classMap) {
@ -44,19 +44,19 @@ class ComposerAutoloaderInit7d7a83344d3b2ded1a3491aa12e59d99
$loader->register(true); $loader->register(true);
if ($useStaticLoader) { if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit7d7a83344d3b2ded1a3491aa12e59d99::$files; $includeFiles = Composer\Autoload\ComposerStaticInit2aa52323e0b287da03f99e87bcdacaad::$files;
} else { } else {
$includeFiles = require __DIR__ . '/autoload_files.php'; $includeFiles = require __DIR__ . '/autoload_files.php';
} }
foreach ($includeFiles as $fileIdentifier => $file) { foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire7d7a83344d3b2ded1a3491aa12e59d99($fileIdentifier, $file); composerRequire2aa52323e0b287da03f99e87bcdacaad($fileIdentifier, $file);
} }
return $loader; return $loader;
} }
} }
function composerRequire7d7a83344d3b2ded1a3491aa12e59d99($fileIdentifier, $file) function composerRequire2aa52323e0b287da03f99e87bcdacaad($fileIdentifier, $file)
{ {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file; require $file;

View File

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

View File

@ -6,7 +6,7 @@
'aliases' => 'aliases' =>
array ( array (
), ),
'reference' => '5687756eda3d6efef7b439f432c90abadcb28987', 'reference' => '05791160868513583fb03b109b1d6ae9ea513e0c',
'name' => 'automattic/jetpack', 'name' => 'automattic/jetpack',
), ),
'versions' => 'versions' =>
@ -18,7 +18,7 @@
'aliases' => 'aliases' =>
array ( array (
), ),
'reference' => '5687756eda3d6efef7b439f432c90abadcb28987', 'reference' => '05791160868513583fb03b109b1d6ae9ea513e0c',
), ),
'automattic/jetpack-a8c-mc-stats' => 'automattic/jetpack-a8c-mc-stats' =>
array ( array (

View File

@ -5,7 +5,7 @@
* @package automattic/jetpack-autoloader * @package automattic/jetpack-autoloader
*/ */
namespace Automattic\Jetpack\Autoloader\jp7d7a83344d3b2ded1a3491aa12e59d99; namespace Automattic\Jetpack\Autoloader\jp2aa52323e0b287da03f99e87bcdacaad;
// phpcs:ignore // phpcs:ignore

View File

@ -5,7 +5,7 @@
* @package automattic/jetpack-autoloader * @package automattic/jetpack-autoloader
*/ */
namespace Automattic\Jetpack\Autoloader\jp7d7a83344d3b2ded1a3491aa12e59d99; namespace Automattic\Jetpack\Autoloader\jp2aa52323e0b287da03f99e87bcdacaad;
// phpcs:ignore // phpcs:ignore

View File

@ -5,7 +5,7 @@
* @package automattic/jetpack-autoloader * @package automattic/jetpack-autoloader
*/ */
namespace Automattic\Jetpack\Autoloader\jp7d7a83344d3b2ded1a3491aa12e59d99; namespace Automattic\Jetpack\Autoloader\jp2aa52323e0b287da03f99e87bcdacaad;
// phpcs:ignore // phpcs:ignore

View File

@ -5,7 +5,7 @@
* @package automattic/jetpack-autoloader * @package automattic/jetpack-autoloader
*/ */
namespace Automattic\Jetpack\Autoloader\jp7d7a83344d3b2ded1a3491aa12e59d99; namespace Automattic\Jetpack\Autoloader\jp2aa52323e0b287da03f99e87bcdacaad;
// phpcs:ignore // phpcs:ignore

View File

@ -5,7 +5,7 @@
* @package automattic/jetpack-autoloader * @package automattic/jetpack-autoloader
*/ */
namespace Automattic\Jetpack\Autoloader\jp7d7a83344d3b2ded1a3491aa12e59d99; namespace Automattic\Jetpack\Autoloader\jp2aa52323e0b287da03f99e87bcdacaad;
// phpcs:ignore // phpcs:ignore

View File

@ -5,7 +5,7 @@
* @package automattic/jetpack-autoloader * @package automattic/jetpack-autoloader
*/ */
namespace Automattic\Jetpack\Autoloader\jp7d7a83344d3b2ded1a3491aa12e59d99; namespace Automattic\Jetpack\Autoloader\jp2aa52323e0b287da03f99e87bcdacaad;
// phpcs:ignore // phpcs:ignore

View File

@ -5,7 +5,7 @@
* @package automattic/jetpack-autoloader * @package automattic/jetpack-autoloader
*/ */
namespace Automattic\Jetpack\Autoloader\jp7d7a83344d3b2ded1a3491aa12e59d99; namespace Automattic\Jetpack\Autoloader\jp2aa52323e0b287da03f99e87bcdacaad;
// phpcs:ignore // phpcs:ignore