mainwp/mainwp-child
1
0
Fork 0
mirror of https://github.com/mainwp/mainwp-child.git synced 2025-09-06 09:20:28 +08:00
Code Issues Projects Packages Wiki Activity Actions

Merge with branch01 + Readme update + Version update

Browse source
This commit is contained in:
ruben- 2016-06-12 18:33:51 +02:00
parent 8eb0cbc617
commit 4eb5825df6
5 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
class/class-mainwp-child-ithemes-security.php
View file

@ -163,6 +163,11 @@ class MainWP_Child_iThemes_Security {
$update_settings = maybe_unserialize( base64_decode( $_POST['settings'] ) );
foreach($update_settings as $module => $settings) {
if (in_array($module, $_itsec_modules)) {
if ($module == 'wordpress-salts') {
$settings['last_generated'] = ITSEC_Modules::get_setting( 'wordpress-salts', 'last_generated' ); // not update
} else if ($module == 'global') {
$settings['nginx_file'] = ITSEC_Modules::get_setting( 'global', 'nginx_file' ); // not update
}
ITSEC_Modules::set_settings( $module, $settings );
$updated = true;
}

2
class/class-mainwp-child.php
View file

@ -84,7 +84,7 @@ if ( isset( $_GET['skeleton_keyuse_nonce_key'] ) && isset( $_GET['skeleton_keyus
}
class MainWP_Child {
public static $version = '3.1.4';
public static $version = '3.1.5';
private $update_version = '1.3';
private $callableFunctions = array(

6
class/class-mainwp-helper.php
View file

@ -631,12 +631,12 @@ class MainWP_Helper {
return array( $dir, $url );
}
static function checkDir( $dir, $dieOnError ) {
static function checkDir( $dir, $dieOnError, $chmod = 0755 ) {
MainWP_Helper::getWPFilesystem();
global $wp_filesystem;
if ( ! file_exists( $dir ) ) {
if ( empty( $wp_filesystem ) ) {
@mkdir( $dir, 0777, true );
@mkdir( $dir, $chmod, true );
} else {
if ( ( 'ftpext' === $wp_filesystem->method ) && defined( 'FTP_BASE' ) ) {
$ftpBase = FTP_BASE;
@ -645,7 +645,7 @@ class MainWP_Helper {
} else {
$tmpdir = $dir;
}
$wp_filesystem->mkdir( $tmpdir, 0777 );
$wp_filesystem->mkdir( $tmpdir, $chmod );
}
if ( ! file_exists( $dir ) ) {

2
mainwp-child.php
View file

@ -6,7 +6,7 @@
Author: MainWP
Author URI: http://mainwp.com
Text Domain: mainwp-child
Version: 3.1.4
Version: 3.1.5
*/
if ( ( isset( $_REQUEST['heatmap'] ) && '1' === $_REQUEST['heatmap'] ) || ( isset( $_REQUEST['mainwpsignature'] ) && ( ! empty( $_REQUEST['mainwpsignature'] ) ) ) ) {
header( 'X-Frame-Options: ALLOWALL' );

10
readme.txt
View file

@ -7,7 +7,7 @@ Author URI: https://mainwp.com
Plugin URI: https://mainwp.com
Requires at least: 3.6
Tested up to: 4.5.2
Stable tag: 3.1.4
Stable tag: 3.1.5
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
@ -57,6 +57,14 @@ To see full documentation and FAQs please visit [MainWP Documentation](http://do
== Changelog ==
= 3.1.5 - 9-12-16 =
* Fixed: Incompatibility with the new version of the iThemes Security version
* Added: Support for the new iThemes Security features
* Added: Support for the new WP Rocket features
* Added: "Currently connected to" check in the Server Information
* Fixed: PHP Notice
* Removed: Unnecesary checks in the Server Information page
= 3.1.4 - 5-9-16 =
* Updated: function execute_snippet() extracted to a separate file