Skip to content

Commit

Permalink
Sync Checksums: Ensure is plugin active exists (#39369)
Browse files Browse the repository at this point in the history
* Ensure is_plugin_active exists

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/10829751085

Upstream-Ref: Automattic/jetpack@49715f5
  • Loading branch information
darssen authored and matticbot committed Sep 12, 2024
1 parent 6a8fed5 commit 21a9825
Show file tree
Hide file tree
Showing 6 changed files with 125 additions and 117 deletions.
3 changes: 3 additions & 0 deletions jetpack_vendor/automattic/jetpack-sync/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ This is an alpha version! The changes listed here are not final.
### Removed
- Social: Cleaned up media auto-conversion backend logic

### Fixed
- Sync: Ensure is_plugin_active exists when loading Table Checksums

## [3.12.0] - 2024-09-10
### Added
- Sync: Enable Full Sync for woocommerce_hpos_orders module [#39297]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ public function __construct() {
public static function get_order_types_to_sync( $prefixed = false ) {
$types = array( 'order', 'order_refund' );

// Ensure this is available.
if ( ! function_exists( 'is_plugin_active' ) ) {
require_once ABSPATH . 'wp-admin/includes/plugin.php';
}

if ( is_plugin_active( self::WOOCOMMERCE_SUBSCRIPTIONS_PATH ) ) {
$types[] = 'subscription';
}
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
),
'jetpack-sync' => array(
'path' => 'jetpack_vendor/automattic/jetpack-sync',
'ver' => '3.13.0-alpha1726022383',
'ver' => '3.13.0-alpha1726139975',
),
),
);
60 changes: 30 additions & 30 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
"reference": "d362264e1d0afa0dedb2dabcd9006b8b6277f88d"
"reference": "e696c84fd6141a5970f0609fb436ab0e6545d54a"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -60,7 +60,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "297189f764726c1afb7891c711b115459afe3d7b"
"reference": "14ef3128f40528d15d9107527ad888d50eda814d"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -125,7 +125,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "0ed7095edf5f4ffac525290958cdd5fb8a900b20"
"reference": "95c489d4539074255ae7200ff3c1ff6ec9d9e9fc"
},
"require": {
"automattic/jetpack-constants": "^2.0.4",
Expand Down Expand Up @@ -194,7 +194,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "72c551abec73f3f61d0b8813632daf133bbcb9c5"
"reference": "11fd34f972a38e1732a43389cc7be47ac8af5d15"
},
"require": {
"composer-plugin-api": "^1.1 || ^2.0",
Expand Down Expand Up @@ -261,7 +261,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
"reference": "ede11d26ed270e0b38782e0b5efbb9c00c107a0b"
"reference": "10a22770ef297722d4de2b99f8908e33f8b514e4"
},
"require": {
"automattic/jetpack-connection": "^4.0.3-alpha",
Expand Down Expand Up @@ -329,7 +329,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
"reference": "f8e08784b8f2a51451cf15da2a848236c974d1b6"
"reference": "c057b6dbf65349f4963ea157d7fbe498427ee075"
},
"require": {
"automattic/jetpack-boost-core": "^0.2.11",
Expand Down Expand Up @@ -405,7 +405,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "193013cee1ba831e86bfde0c13e3b2239984c420"
"reference": "02a7feaabc0ea79035b9bc7075861a9c1d46bf06"
},
"require": {
"composer-plugin-api": "^2.1.0",
Expand Down Expand Up @@ -465,7 +465,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "55cc056f050575b9d88b0da81d58328b65567f5f"
"reference": "fe9319259c39f02926365893dbee6336fac868be"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -540,7 +540,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "3631f061e98aba2bf936adc515f476b8b8ae0ada"
"reference": "bc2c96bca9cdfb056cd5f52bf39ce4395f7ccc46"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^2.0.2",
Expand Down Expand Up @@ -630,7 +630,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "9f9ec57837ddf2ca565b0e556a50a22d79de3c4d"
"reference": "7747ea69281cd5e355239e5d8596965dcc0be608"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -684,7 +684,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "9ba252e8f8ff8ff7d9e9667a69ab85effb49f7c3"
"reference": "96632526cde8f5eaddc4bbe85706ec8e1ca0acef"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -737,7 +737,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
"reference": "dbd6dafec429cbd24d359ff25bfb935cfea6f074"
"reference": "ea9f08f7413302ce54a6295316aceecec6926b12"
},
"require": {
"automattic/jetpack-connection": "^4.0.3-alpha",
Expand Down Expand Up @@ -812,7 +812,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "98c3f0921712d751dd82e8c19fed867c9994a4fc"
"reference": "241fad1f3349834c11f6a41dc38e075c54718c0d"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -870,7 +870,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "3d4f39130ea2128aa9c2ba5d5836e9eefc9ddfda"
"reference": "4ff0df9938df762745649b223aa6755e564859de"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^2.0.2",
Expand Down Expand Up @@ -945,7 +945,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "1bbb816aec5ec54c479d58510d1c6d8f46b26954"
"reference": "c6d7d73e3d32142f9d813fa854f992247e0d7f32"
},
"require": {
"automattic/jetpack-connection": "^4.0.3-alpha",
Expand Down Expand Up @@ -1007,7 +1007,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "271f358973d62ac5483053b1f8eeba4d7f1fff88"
"reference": "5b344c6ec06c7b1e83f33fa288c1332d8f1d61d6"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1060,7 +1060,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "9ca3e0a59b1c18e4745170c9bfaee6063dbddaaa"
"reference": "9aefcc6421e01189235d45daf83a618f44663e79"
},
"require": {
"automattic/jetpack-admin-ui": "^0.4.5",
Expand Down Expand Up @@ -1162,7 +1162,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "0fa87302632b1c51f98bf7748c0516bb1358737e"
"reference": "a41482c091a992b9d74970e7eef15bc1d1d48f47"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1223,7 +1223,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "92f597789dcd97b17e17b46850b5cab72a69e006"
"reference": "5098f281e86552a8656d2e62666b467d0fbba0f6"
},
"require": {
"automattic/jetpack-connection": "^4.0.3-alpha",
Expand Down Expand Up @@ -1291,7 +1291,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "b749922b4a97a03090db5d31c57095ced01740c0"
"reference": "0dd170113569b103d24d9b4928120e804028ff9a"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^2.0.2",
Expand Down Expand Up @@ -1347,7 +1347,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
"reference": "ca0861a30ee3f6d04b33f3bd9470d060137c6453"
"reference": "963f5361278ad8ff2ada9879dcd0a0b35185b2f8"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1417,7 +1417,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
"reference": "00521d5ded5964e0eadafdf6fd18df4ffd46a170"
"reference": "ce23a0519a17caaa216de7ed29317a8587a33a53"
},
"require": {
"automattic/jetpack-connection": "^4.0.3-alpha",
Expand Down Expand Up @@ -1492,7 +1492,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "3669a30fdd993ee758de4ab93238e2e1efb32f12"
"reference": "5cbd40bedf45ba045374c62ba3f6ac00742a08f8"
},
"require": {
"automattic/jetpack-status": "^4.0.1",
Expand Down Expand Up @@ -1547,7 +1547,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "adabaaf8aaf0ed629c80e8708ccf7654ed157033"
"reference": "6a6185108fb404daff2e2a675d2d69ad7c523df8"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1601,7 +1601,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-search",
"reference": "c5ac5660108dc1c49baf55a364342abe2545d42e"
"reference": "35244f6cdb8fa1c786880661504c264c4897e39e"
},
"require": {
"automattic/jetpack-assets": "^2.3.8",
Expand Down Expand Up @@ -1689,7 +1689,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-stats",
"reference": "a1c446cda32df3716558d9aae5b4c962ec994069"
"reference": "9bcbfd853874db9f10033cb714cdf0ac45df5136"
},
"require": {
"automattic/jetpack-connection": "^4.0.3-alpha",
Expand Down Expand Up @@ -1756,7 +1756,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "8c73c1229300ac8908a426fdbf111e9917d87e1c"
"reference": "7dd8b065bed7ee0f4dba282d39c815d519563536"
},
"require": {
"automattic/jetpack-constants": "^2.0.4",
Expand Down Expand Up @@ -1815,12 +1815,12 @@
},
{
"name": "automattic/jetpack-sync",
"version": "3.13.0-alpha.1726022383",
"version_normalized": "3.13.0.0-alpha1726022383",
"version": "3.13.0-alpha.1726139975",
"version_normalized": "3.13.0.0-alpha1726139975",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "e2c6655f7ba4ad90fe05874b10f2135e3a4ab6d7"
"reference": "31d363b5d05e88c8260f92fb5f5c364aeb8278f4"
},
"require": {
"automattic/jetpack-connection": "^4.0.3-alpha",
Expand Down
Loading

0 comments on commit 21a9825

Please sign in to comment.