Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed the MaxMind database update process to move the existing archive instead of deleting it

This commit is contained in:
Christopher Allford 2020-01-15 10:24:13 -08:00
parent 5bafac3012
commit 2b503e0409
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/class-wc-install.php
View File

@ -136,7 +136,7 @@ class WC_Install {
'wc_update_370_db_version',
),
'3.9.0' => array(
'wc_update_390_remove_maxmind_database',
'wc_update_390_move_maxmind_database',
'wc_update_390_change_geolocation_database_update_cron',
'wc_update_390_db_version',
),

21
includes/wc-update-functions.php
View File

@ -2048,12 +2048,23 @@ function wc_update_370_db_version() {
}
/**
* The TOS for MaxMind's databases require that they be deleted. Since we're making significant changes to
* the location and function of the database downloads, let's remove the legacy database altogether.
* We've moved the MaxMind database to a new location, as per the TOS' requirement that the database not
* be publicly accessible.
*/
function wc_update_390_remove_maxmind_database() {
// Make sure to remove the file using the path as it was previously defined in WC_Geolocation!
@unlink( WP_CONTENT_DIR . '/uploads/GeoLite2-Country.mmdb' ); // phpcs:ignore Generic.PHP.NoSilencedErrors.Discouraged
function wc_update_390_move_maxmind_database() {
// Make sure to use all of the correct filters to pull the local database path.
$old_path = apply_filters( 'woocommerce_geolocation_local_database_path', WP_CONTENT_DIR . '/uploads/GeoLite2-Country.mmdb', 2 );
// Generate a prefix for the old file and store it in the integration as it would expect it.
$prefix = wp_generate_password( 32, false );
update_option( 'woocommerce_maxmind_geolocation_settings', array( 'database_prefix' => $prefix ) );
// Generate the new path in the same way that the integration will.
$uploads_dir = wp_upload_dir();
$new_path = trailingslashit( $uploads_dir['basedir'] ) . 'woocommerce_uploads/' . $prefix . '-GeoLite2-Country.mmdb';
$new_path = apply_filters( 'woocommerce_geolocation_local_database_path', $new_path, 2 );
@rename( $old_path, $new_path ); // phpcs:ignore Generic.PHP.NoSilencedErrors.Discouraged
}
/**