Skip to content

Fixed: wp version issue for some host #456

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
thanghv merged 4 commits into from
Apr 22, 2025
Merged

Fixed: wp version issue for some host #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7510a1c
Fixed: wp version issue for some host
thanghv Apr 17, 2025
3e8950f
[CodeFactor] Apply fixes to commit 7510a1c
code-factor Apr 17, 2025
6c25d14
Fixed: time zone issue for non mainwp changes
thanghv Apr 18, 2025
9275230
Update: readme and version number
thanghv Apr 22, 2025
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
11 changes: 5 additions & 6 deletions class/class-mainwp-child-actions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,15 +605,15 @@ public function callback_deleted_plugin( $plugin_file, $deleted ) {
* @return mixed bool|null.
*/
public function callback_automatic_updates_complete( $update_results ) {
global $pagenow, $wp_version;
global $pagenow;

if ( ! is_array( $update_results ) || ! isset( $update_results['core'] ) ) {
return false;
}

$info = $update_results['core'][0];

$old_version = $wp_version;
$old_version = MainWP_Child_Server_Information_Base::get_wordpress_version();
$new_version = $info->item->version;
$auto_updated = true;

Expand All @@ -636,11 +636,10 @@ public function callback__core_updated_successfully() {
* Global variables.
*
* @global string $pagenow Current page.
* @global string $wp_version WordPress version.
*/
global $pagenow, $wp_version;
global $pagenow;

$old_version = $wp_version;
$old_version = MainWP_Child_Server_Information_Base::get_wordpress_version();
$auto_updated = ( 'update-core.php' !== $pagenow );

if ( $auto_updated ) {
Expand Down Expand Up @@ -820,7 +819,7 @@ function ( $val ) {
'extra_info' => $extra_info,
);

$created = MainWP_Helper::get_timestamp();
$created = time();

$action = (string) $action;

Expand Down
10 changes: 4 additions & 6 deletions class/class-mainwp-child-back-up-buddy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1513,10 +1513,9 @@ public function restore_file_restore() {

\pb_backupbuddy::set_status_serial( 'restore' );

/** @global string $wp_version WordPress version. */
global $wp_version;
$wp_ver = MainWP_Child_Server_Information_Base::get_wordpress_version();

\pb_backupbuddy::status( 'details', 'BackupBuddy v' . \pb_backupbuddy::settings( 'version' ) . ' using WordPress v' . $wp_version . ' on ' . PHP_OS . '.' );
\pb_backupbuddy::status( 'details', 'BackupBuddy v' . \pb_backupbuddy::settings( 'version' ) . ' using WordPress v' . $wp_ver . ' on ' . PHP_OS . '.' );

require_once \pb_backupbuddy::plugin_path() . '/classes/_restoreFiles.php'; // NOSONAR - WP compatible.

Expand Down Expand Up @@ -3045,12 +3044,11 @@ public function live_setup() { // NOSONAR - WP compatible.
require_once \pb_backupbuddy::plugin_path() . '/destinations/stash2/init.php'; // NOSONAR - WP compatible.
require_once \pb_backupbuddy::plugin_path() . '/destinations/live/init.php'; // NOSONAR - WP compatible.

/** @global string $wp_version WordPress version. */
global $wp_version;
$wp_ver = MainWP_Child_Server_Information_Base::get_wordpress_version();

$itxapi_username = strtolower( $_POST['live_username'] );
$password_hash = \iThemes_Credentials::get_password_hash( $itxapi_username, $_POST['live_password'] );
$access_token = \ITXAPI_Helper2::get_access_token( $itxapi_username, $password_hash, site_url(), $wp_version );
$access_token = \ITXAPI_Helper2::get_access_token( $itxapi_username, $password_hash, site_url(), $wp_ver );

$settings = array(
'itxapi_username' => $itxapi_username,
Expand Down
9 changes: 2 additions & 7 deletions class/class-mainwp-child-plugins-check.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,17 +346,12 @@ private function try_get_response_body( $plugin, $second_pass ) { //phpcs:ignore
// Get the WordPress current version to be polite in the API call.
include_once ABSPATH . WPINC . '/version.php'; // NOSONAR - WP compatible.

/**
* The installed version of WordPress.
*
* @global string $wp_version The installed version of WordPress.
*/
global $wp_version;
$wp_ver = MainWP_Child_Server_Information_Base::get_wordpress_version();

// General options to be passed to wp_remote_get.
$options = array(
'timeout' => 60 * 60,
'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ),
'user-agent' => 'WordPress/' . $wp_ver . '; ' . get_bloginfo( 'url' ),
);

// The URL for the endpoint.
Expand Down
6 changes: 5 additions & 1 deletion class/class-mainwp-child-server-information-base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ protected static function get_bzip_enabled() {
*
* @return string $wp_version Current WordPress version.
*/
protected static function get_wordpress_version() {
public static function get_wordpress_version() {

/**
* The installed version of WordPress.
Expand All @@ -306,6 +306,10 @@ protected static function get_wordpress_version() {
*/
global $wp_version;

if ( function_exists( '\wp_get_wp_version' ) ) {
return \wp_get_wp_version();
}

return $wp_version;
}

Expand Down
39 changes: 6 additions & 33 deletions class/class-mainwp-child-stats.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,18 +104,8 @@ public function get_site_stats_no_auth( $information = array() ) {
MainWP_Helper::instance()->error( esc_html__( 'This site already contains a link. Please deactivate and reactivate the MainWP plugin.', 'mainwp-child' ) . $hint );
}

/**
* The installed version of WordPress.
*
* @global string $wp_version The installed version of WordPress.
*
* @uses \MainWP\Child\MainWP_Child::$version
* @uses \MainWP\Child\MainWP_Helper::write()
*/
global $wp_version;

$information['version'] = MainWP_Child::$version;
$information['wpversion'] = $wp_version;
$information['wpversion'] = MainWP_Child_Server_Information_Base::get_wordpress_version();
$information['wpe'] = MainWP_Helper::is_wp_engine() ? 1 : 0;
$information['wphost'] = MainWP_Helper::get_wp_host();
MainWP_Helper::write( $information );
Expand Down Expand Up @@ -595,27 +585,15 @@ private function stats_theme_update( $premiumThemes ) { //phpcs:ignore -- NOSONA
*/
private function stats_get_info( &$information ) {

/**
* The installed version of WordPress.
*
* @global string $wp_version The installed version of WordPress.
*
* @uses \MainWP\Child\MainWP_Child::$version
* @uses \MainWP\Child\MainWP_Helper::is_wp_engine()
* @uses \MainWP\Child\MainWP_Helper::is_ssl_enabled()
* @uses \MainWP\Child\MainWP_Helper::update_option()
*/
global $wp_version;

$information['version'] = MainWP_Child::$version;
$information['wpversion'] = $wp_version;
$information['wpversion'] = MainWP_Child_Server_Information_Base::get_wordpress_version();
$information['siteurl'] = get_option( 'siteurl' );
$information['wpe'] = MainWP_Helper::is_wp_engine() ? 1 : 0;
$information['wphost'] = MainWP_Helper::get_wp_host();

$theme_name = wp_get_theme()->get( 'Name' );
$information['site_info'] = array(
'wpversion' => $wp_version,
'wpversion' => MainWP_Child_Server_Information_Base::get_wordpress_version(),
'debug_mode' => ( defined( 'WP_DEBUG' ) && true === WP_DEBUG ) ? true : false,
'phpversion' => phpversion(),
'child_version' => MainWP_Child::$version,
Expand All @@ -639,13 +617,6 @@ private function stats_get_info( &$information ) {
*/
public function stats_wp_update() {

/**
* The installed version of WordPress.
*
* @global string $wp_version The installed version of WordPress.
*/
global $wp_version;

$result = null;

// Check for new versions.
Expand All @@ -660,12 +631,14 @@ public function stats_wp_update() {

$core_updates = get_core_updates();

$wp_ver = MainWP_Child_Server_Information_Base::get_wordpress_version();

if ( is_array( $core_updates ) && count( $core_updates ) > 0 ) {
foreach ( $core_updates as $core_update ) {
if ( 'latest' === $core_update->response ) {
break;
}
if ( 'upgrade' === $core_update->response && version_compare( $wp_version, $core_update->current, '<=' ) ) {
if ( 'upgrade' === $core_update->response && version_compare( $wp_ver, $core_update->current, '<=' ) ) {
$result = $core_update->current;
}
}
Expand Down
18 changes: 5 additions & 13 deletions class/class-mainwp-child-updates.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1139,13 +1139,6 @@ public function detect_premium_themesplugins_updates() {
*/
public function upgrade_wp() {

/**
* The installed version of WordPress.
*
* @global string $wp_version The installed version of WordPress.
*/
global $wp_version;

MainWP_Helper::get_wp_filesystem();

$information = array();
Expand Down Expand Up @@ -1222,15 +1215,14 @@ private function do_upgrade_wp( &$information ) { //phpcs:ignore -- NOSONAR - co
// Check for new versions.
MainWP_System::wp_mainwp_version_check();

global $wp_version;

$wp_ver = MainWP_Child_Server_Information_Base::get_wordpress_version();
$core_updates = get_core_updates();
if ( is_array( $core_updates ) && count( $core_updates ) > 0 ) {
foreach ( $core_updates as $core_update ) {
if ( 'latest' === $core_update->response ) {
$information['upgrade'] = 'SUCCESS';
} elseif ( 'upgrade' === $core_update->response && get_locale() === $core_update->locale && version_compare( $wp_version, $core_update->current, '<=' ) ) {
$old_ver = $wp_version;
} elseif ( 'upgrade' === $core_update->response && get_locale() === $core_update->locale && version_compare( $wp_ver, $core_update->current, '<=' ) ) {
$old_ver = $wp_ver;
$current_ver = $core_update->current;

// Upgrade!
Expand All @@ -1256,8 +1248,8 @@ private function do_upgrade_wp( &$information ) { //phpcs:ignore -- NOSONAR - co

if ( ! isset( $information['upgrade'] ) ) {
foreach ( $core_updates as $core_update ) {
if ( 'upgrade' === $core_update->response && version_compare( $wp_version, $core_update->current, '<=' ) ) {
$old_ver = $wp_version;
if ( 'upgrade' === $core_update->response && version_compare( $wp_ver, $core_update->current, '<=' ) ) {
$old_ver = $wp_ver;
$current_ver = $core_update->current;
// Upgrade!
$upgrade = false;
Expand Down
9 changes: 6 additions & 3 deletions class/class-mainwp-child-updraft-plus-backups.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2244,7 +2244,10 @@ private function analyse_db_file_old( $timestamp, $res, $db_file = false, $heade
* @global object $wp_filesystem WordPress filesystem.
* @global object $updraftplus UpdraftPlus object.
*/
global $updraftplus, $wp_version;
global $updraftplus;

$wp_ver = MainWP_Child_Server_Information_Base::get_wordpress_version();


include_once ABSPATH . WPINC . '/version.php'; // NOSONAR - WP compatible.

Expand Down Expand Up @@ -2385,8 +2388,8 @@ private function analyse_db_file_old( $timestamp, $res, $db_file = false, $heade
if ( ! empty( $matches[3] ) ) {
$old_wp_version .= substr( $matches[3], 0, strlen( $matches[3] ) - 1 );
}
if ( version_compare( $old_wp_version, $wp_version, '>' ) ) {
$warn[] = sprintf( esc_html__( 'You are importing from a newer version of WordPress (%1$s) into an older one (%2$s). There are no guarantees that WordPress can handle this.', 'updraftplus' ), $old_wp_version, $wp_version );
if ( version_compare( $old_wp_version, $wp_ver, '>' ) ) {
$warn[] = sprintf( esc_html__( 'You are importing from a newer version of WordPress (%1$s) into an older one (%2$s). There are no guarantees that WordPress can handle this.', 'updraftplus' ), $old_wp_version, $wp_ver );
}
if ( preg_match( '/running on PHP (\d+\.\d+)([\s\.])/', $matches[4], $nmatches ) && preg_match( '/^(\d+\.\d+)([\s\.])/', PHP_VERSION, $cmatches ) ) {
$old_php_version = $nmatches[1];
Expand Down
10 changes: 5 additions & 5 deletions class/class-mainwp-child-vulnerability-checker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,11 +308,11 @@ public function check_plugins( $force = false, $service = '' ) { //phpcs:ignore
*/
public function check_wp( $force = false, $service = '' ) {
$wp_vuln = get_transient( 'mainwp_vulnche_trans_wp_json' );
$wp_version = get_bloginfo( 'version' );
$number_version = str_replace( '.', '', $wp_version );
$wp_ver = MainWP_Child_Server_Information_Base::get_wordpress_version();
$number_version = str_replace( '.', '', $wp_ver );
if ( false === $wp_vuln || $force ) {
if ( 'nvd_nist' === $service ) {
$url = $this->wpvulndb_nvd_api . '?virtualMatchString=cpe:2.3:a:WordPress:WordPress:' . $wp_version;
$url = $this->wpvulndb_nvd_api . '?virtualMatchString=cpe:2.3:a:WordPress:WordPress:' . $wp_ver;
} elseif ( 'wordfence' === $service ) {
$url = $this->wordfence_api_url . 'production?keyword=WordPress';
} else {
Expand All @@ -321,12 +321,12 @@ public function check_wp( $force = false, $service = '' ) {
$wp_vuln = $this->vulnche_get_content( $url, $service );

if ( 'nvd_nist' === $service ) {
$wp_vuln = $this->get_vuln_nvd_nist_info( $wp_vuln, 'WordPress', $wp_version ); //phpcs:ignore -- wordpress.
$wp_vuln = $this->get_vuln_nvd_nist_info( $wp_vuln, 'WordPress', $wp_ver ); //phpcs:ignore -- wordpress.
$wp_vuln = wp_json_encode( $wp_vuln );
}

if ( 'wordfence' === $service ) {
$wp_vuln = $this->get_vuln_wordfence_info( $wp_vuln, 'WordPress', $wp_version );
$wp_vuln = $this->get_vuln_wordfence_info( $wp_vuln, 'WordPress', $wp_ver );
$wp_vuln = wp_json_encode( $wp_vuln );
}

Expand Down
4 changes: 3 additions & 1 deletion class/class-mainwp-child-wordfence.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3337,10 +3337,12 @@ public function get_diagnostics() { //phpcs:ignore -- NOSONAR - ignore complex.
}
}

$wp_ver = MainWP_Child_Server_Information_Base::get_wordpress_version();

$wordPressValues = array(
'WordPress Version' => array(
'description' => '',
'value' => $wp_version,
'value' => $wp_ver,
),
'WP_DEBUG' => array(
'description' => 'WordPress debug mode',
Expand Down
2 changes: 1 addition & 1 deletion class/class-mainwp-child.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class MainWP_Child {
*
* @var string MainWP Child plugin version.
*/
public static $version = '5.4.0.5'; // NOSONAR - not IP.
public static $version = '5.4.0.6'; // NOSONAR - not IP.

/**
* Private variable containing the latest MainWP Child update version.
Expand Down
15 changes: 5 additions & 10 deletions class/class-mainwp-clone.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,10 @@ private function create_clone_backup() { // phpcs:ignore -- Current complexity i
}
//phpcs:disable WordPress.Security.NonceVerification,WordPress.Security.NonceVerification.Missing,WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
$wpversion = isset( $_POST['wpversion'] ) ? sanitize_text_field( wp_unslash( $_POST['wpversion'] ) ) : '';
global $wp_version;
$includeCoreFiles = ( $wpversion !== $wp_version );

$wp_ver = MainWP_Child_Server_Information_Base::get_wordpress_version();

$includeCoreFiles = ( $wpversion !== $wp_ver );
$excludes = ( isset( $_POST['exclude'] ) ? explode( ',', wp_unslash( $_POST['exclude'] ) ) : array() ); //phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
$excludes[] = str_replace( ABSPATH, '', WP_CONTENT_DIR ) . '/uploads/mainwp';
$uploadDir = MainWP_Helper::get_mainwp_dir();
Expand Down Expand Up @@ -455,21 +457,14 @@ public function clone_backup_create() {
$timeout = 20 * 60 * 60;
MainWP_Helper::set_limit( $timeout );

/**
* The installed version of WordPress.
*
* @global string $wp_version The installed version of WordPress.
*/
global $wp_version;

$method = ( function_exists( 'gzopen' ) ? 'tar.gz' : 'zip' );
$result = MainWP_Utility::fetch_url(
$url,
array(
'cloneFunc' => 'createCloneBackup',
'key' => $key,
'f' => $rand,
'wpversion' => $wp_version,
'wpversion' => MainWP_Child_Server_Information_Base::get_wordpress_version(),
'zipmethod' => $method,
)
);
Expand Down
2 changes: 1 addition & 1 deletion mainwp-child.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Author: MainWP
* Author URI: https://mainwp.com
* Text Domain: mainwp-child
* Version: 5.4.0.5
* Version: 5.4.0.6
* Requires at least: 5.4
* Requires PHP: 7.4
*/
Expand Down
7 changes: 6 additions & 1 deletion readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Plugin URI: https://mainwp.com
Requires at least: 6.2
Tested up to: 6.8
Requires PHP: 7.4
Stable tag: 5.4.0.5
Stable tag: 5.4.0.6
License: GPLv3 or later
License URI: https://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -111,6 +111,11 @@ We have an extensive FAQ with more questions and answers [here](https://mainwp.c

== Changelog ==

= 5.4.0.6 - Maintenance Release - 4-22-2025 =

* Updated: Implemented the `time()` function to capture Sites Changes event timestamps instead of a custom method, resolving display issues caused by timezone differences.
* Updated: Implemented `wp_get_wp_version()` method to retrieve WordPress version instead of using the global `$wp_version` variable for improved code reliability. (#762)[https://github.com/mainwp/mainwp/issues/762]

= 5.4.0.5 - Maintenance Release - 4-15-2025 =

* Fixed: Site Changes filter "Users" filter showing only some users.
Expand Down