Skip to content

3rd Party: Remove code from the global scope #14264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kraftbj merged 1 commit into from
Dec 19, 2019
Merged

3rd Party: Remove code from the global scope #14264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 29 additions & 20 deletions 3rd-party/3rd-party.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,35 @@
* @package Jetpack
*/

// Array of third-party compat files to always require.
$compat_files = array(
'bbpress.php',
'beaverbuilder.php',
'bitly.php',
'buddypress.php',
'class.jetpack-amp-support.php',
'class.jetpack-modules-overrides.php', // Special case. Tools to be used to override module settings.
'debug-bar.php',
'domain-mapping.php',
'polldaddy.php',
'qtranslate-x.php',
'vaultpress.php',
'wpml.php',
'woocommerce.php',
'woocommerce-services.php',
);
namespace Automattic\Jetpack;

foreach ( $compat_files as $file ) {
if ( file_exists( JETPACK__PLUGIN_DIR . '/3rd-party/' . $file ) ) {
require_once JETPACK__PLUGIN_DIR . '/3rd-party/' . $file;
/**
* Loads the individual 3rd-party compat files.
*/
function load_3rd_party() {
// Array of third-party compat files to always require.
$compat_files = array(
'bbpress.php',
'beaverbuilder.php',
'bitly.php',
'buddypress.php',
'class.jetpack-amp-support.php',
'class.jetpack-modules-overrides.php', // Special case. Tools to be used to override module settings.
'debug-bar.php',
'domain-mapping.php',
'polldaddy.php',
'qtranslate-x.php',
'vaultpress.php',
'wpml.php',
'woocommerce.php',
'woocommerce-services.php',
);

foreach ( $compat_files as $file ) {
if ( file_exists( JETPACK__PLUGIN_DIR . '/3rd-party/' . $file ) ) {
require_once JETPACK__PLUGIN_DIR . '/3rd-party/' . $file;
}
}
}

load_3rd_party();