Skip to content

Commit 2e44555

Browse files
thanghvthanghv
authored
Merge pull request #363 from mainwp/mainwp-child-dev
Mainwp child dev
2 parents 09c9b5f + c74d7e7 commit 2e44555

8 files changed

Lines changed: 17 additions & 15 deletions

‎class/class-mainwp-child-server-information.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ private static function render_php_settings_rows() {
678678
<td style="background: #333; color: #fff;"
679679
colspan="5"><?php esc_html_e( 'PHP SETTINGS', 'mainwp-child' ); ?></td>
680680
</tr>
681-
<?php self::render_row( 'PHP Version', '>=', '5.6', 'get_php_version' ); ?>
681+
<?php self::render_row( 'PHP Version', '>=', '7.4', 'get_php_version' ); ?>
682682
<tr>
683683
<td></td>
684684
<td><?php esc_html_e( 'PHP Safe Mode Disabled', 'mainwp-child' ); ?></td>

‎class/class-mainwp-child-wordfence.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ class MainWP_Child_Wordfence {
5757
const OPTIONS_TYPE_DIAGNOSTICS = 'diagnostics';
5858
const OPTIONS_TYPE_ALL = 'alloptions';
5959

60-
public const BLOCK_TYPE_COMPLEX = 'complex';
61-
public const BLOCK_TYPE_BRUTE_FORCE = 'bruteforce';
62-
public const BLOCK_TYPE_BLACKLIST = 'blacklist';
60+
const BLOCK_TYPE_COMPLEX = 'complex';
61+
const BLOCK_TYPE_BRUTE_FORCE = 'bruteforce';
62+
const BLOCK_TYPE_BLACKLIST = 'blacklist';
6363

6464
/**
6565
* Public variable to hold the KEY_TYPE_FREE value.

‎class/class-mainwp-child.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class MainWP_Child {
3333
*
3434
* @var string MainWP Child plugin version.
3535
*/
36-
public static $version = '4.4';
36+
public static $version = '4.4.0.1';
3737

3838
/**
3939
* Private variable containing the latest MainWP Child update version.

‎class/class-mainwp-client-report-base.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,6 @@ public function get_other_tokens_data( $records, $tokens, &$skip_records ) { //
390390
$token_values[ $token ] = $this->wfc_getblockedcount();
391391
} elseif ( 'issue' === $action ) {
392392
$token_values[ $token ] = $this->wfc_getissuecount();
393-
} else {
394-
$token_values[ $token ] = 0;
395393
}
396394
} elseif ( 'ithemes_scan' === $context ) {
397395
if ( 'ithemes_scan' === $context ) {
@@ -407,8 +405,6 @@ public function get_other_tokens_data( $records, $tokens, &$skip_records ) { //
407405
)
408406
);
409407
$token_values[ $token ] = $count;
410-
} else {
411-
$token_values[ $token ] = 0;
412408
}
413409
}
414410
}

‎class/class-mainwp-clone-page.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ private static function render_clone_from_server() {
392392
$dirparts = '<a href="' . $durl . '">' . $part . DIRECTORY_SEPARATOR . '</a>' . $dirparts;
393393
}
394394

395-
echo '<div style="padding: 8px 12px; background-color: #e5e5e5; margin-top: 1em;">' . esc_html__( '<strong>Current Directory:</strong> <span>' . $dirparts . '</span>', 'mainwp-child' ) . '</div>';
395+
echo '<div style="padding: 8px 12px; background-color: #e5e5e5; margin-top: 1em;">' . sprintf( esc_html__( '%1$sCurrent Directory:%2$s %3$s', 'mainwp-child' ), '<strong>', '</strong>', '<span>' . $dirparts . '</span>' ) . '</div>';
396396
$quick_dirs = array();
397397
$quick_dirs[] = array( esc_html__( 'Site Root', 'mainwp-child' ), ABSPATH );
398398
$quick_dirs[] = array( esc_html__( 'Backup', 'mainwp-child' ), $backup_dir );
@@ -414,7 +414,7 @@ private static function render_clone_from_server() {
414414
}
415415

416416
if ( ! empty( $quick_links ) ) {
417-
echo '<div style="padding: 8px 12px; border-bottom: 1px solid #e5e5e5; margin-bottom: 1em;"><strong>' . esc_html__( 'Quick Jump:', 'mainwp-child' ) . '</strong> ' . esc_html__( implode( ' | ', $quick_links ) ) . '</div>';
417+
echo '<div style="padding: 8px 12px; border-bottom: 1px solid #e5e5e5; margin-bottom: 1em;"><strong>' . esc_html__( 'Quick Jump:', 'mainwp-child' ) . '</strong> ' . implode( ' | ', $quick_links ) . '</div>';
418418
}
419419

420420
self::render_clone_from_server_form( $current_dir, $url );

‎class/class-mainwp-pages.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function admin_notice() {
108108

109109
$msg = '<div style="margin:50px 20px 20px 0;background:#fff;border:1px solid #c3c4c7;border-top-color:#d63638;border-top-width:5px;padding:20px;">';
110110
$msg .= '<h3 style="margin-top:0;color:#d63638;font-weight:900;">' . esc_html__( 'Attention! ', 'mainwp-child' ) . $child_name . esc_html__( ' plugin is activated but not connected.', 'mainwp-child' ) . '</h3>';
111-
$msg .= '<p style="font-size:15px">' . esc_html__( 'Please add this site to your ', 'mainwp-child' ) . $dashboard_name . ' ' . esc_html__( '<strong>NOW</strong> or deactivate the ', 'mainwp-child' ) . $child_name . esc_html__( ' plugin until you are ready to connect this site to your Dashboard in order to avoid unexpected security issues. ', 'mainwp-child' );
111+
$msg .= '<p style="font-size:15px">' . esc_html__( 'Please add this site to your ', 'mainwp-child' ) . $dashboard_name . ' ' . esc_html__( 'NOW or deactivate the ', 'mainwp-child' ) . $child_name . esc_html__( ' plugin until you are ready to connect this site to your Dashboard in order to avoid unexpected security issues. ', 'mainwp-child' );
112112
$msg .= sprintf( esc_html__( 'If you are not sure how to do it, please review this %1$shelp document%2$s.', 'mainwp-child' ), '<a href="https://kb.mainwp.com/docs/add-site-to-your-dashboard/" target="_blank">', '</a>' ) . '</p>';
113113
if ( ! MainWP_Child_Branding::instance()->is_branding() ) {
114114
$msg .= '<p style="font-size:15px">' . esc_html__( 'You can also turn on the unique security ID option in ', 'mainwp-child' ) . $child_name . sprintf( esc_html__( ' %1$ssettings%2$s if you would like extra security and additional time to add this site to your Dashboard. ', 'maiwnip-child' ), '<a href="admin.php?page=mainwp_child_tab">', '</a>' );

‎mainwp-child.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
* Author: MainWP
1313
* Author URI: https://mainwp.com
1414
* Text Domain: mainwp-child
15-
* Version: 4.4
15+
* Version: 4.4.0.1
1616
* Requires at least: 5.4
17-
* Requires PHP: 7.0
17+
* Requires PHP: 7.4
1818
*/
1919

2020
require_once ABSPATH . 'wp-includes' . DIRECTORY_SEPARATOR . 'version.php'; // Version information from WordPress.

‎readme.txt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Plugin URI: https://mainwp.com
77
Requires at least: 5.4
88
Tested up to: 6.1.1
99
Requires PHP: 7.0
10-
Stable tag: 4.4
10+
Stable tag: 4.4.0.1
1111
License: GPLv3 or later
1212
License URI: https://www.gnu.org/licenses/gpl-3.0.html
1313

@@ -147,6 +147,12 @@ Sure we have a quick FAQ with a lot more questions and answers [here](https://ma
147147

148148
== Changelog ==
149149

150+
= 4.4.0.1 - 3-9-2023 =
151+
* Fixed: PHP 7.0 compatibility warning
152+
* Fixed: Incorrect Wordfence scans count
153+
* Fixed: Cosmetic issues caused by escaping HTML tags in notifications
154+
* Updated: Increased the PHP version minimal requirement to PHP 7.4
155+
150156
= 4.4 - 2-20-2023 =
151157
* Added: support for new extensions
152158
* Preventative: Multiple security enhancements

0 commit comments

Comments
 (0)