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

Fixed: Conflict with SendGrid

Browse source
This commit is contained in:
ruben- 2016-12-09 08:44:15 +01:00
parent 2ba900e762
commit 3283eec336
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
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 { class MainWP_Child {
public static $version = '3.2.3'; public static $version = '3.2.4';
private $update_version = '1.3'; private $update_version = '1.3';
private $callableFunctions = array( private $callableFunctions = array(
@ -773,6 +773,9 @@ class MainWP_Child {
function admin_init() { function admin_init() {
MainWP_Child_Branding::admin_init(); MainWP_Child_Branding::admin_init();
if ( MainWP_Helper::isAdmin() && is_admin() ) {
MainWP_Clone::get()->init_ajax();
}
} }
function admin_head() { function admin_head() {

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

@ -76,8 +76,6 @@ class MainWP_Clone {
} }
public function init() { public function init() {
self::init_ajax();
add_action( 'check_admin_referer', array( 'MainWP_Clone', 'permalinkChanged' ) ); add_action( 'check_admin_referer', array( 'MainWP_Clone', 'permalinkChanged' ) );
if ( get_option( 'mainwp_child_clone_permalink' ) || get_option( 'mainwp_child_restore_permalink' ) ) { if ( get_option( 'mainwp_child_clone_permalink' ) || get_option( 'mainwp_child_restore_permalink' ) ) {
add_action( 'admin_notices', array( 'MainWP_Clone', 'permalinkAdminNotice' ) ); add_action( 'admin_notices', array( 'MainWP_Clone', 'permalinkAdminNotice' ) );

2
mainwp-child.php
View file

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

5
readme.txt
View file

@ -7,7 +7,7 @@ Author URI: https://mainwp.com
Plugin URI: https://mainwp.com Plugin URI: https://mainwp.com
Requires at least: 3.6 Requires at least: 3.6
Tested up to: 4.7 Tested up to: 4.7
Stable tag: 3.2.3 Stable tag: 3.2.4
License: GPLv2 or later License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html License URI: http://www.gnu.org/licenses/gpl-2.0.html
@ -57,6 +57,9 @@ To see full documentation and FAQs please visit [MainWP Documentation](http://do
== Changelog == == Changelog ==
= 3.2.4 - 12-09-16 =
* Fixed: Conflict with SendGrid
= 3.2.3 - 12-08-16 = = 3.2.3 - 12-08-16 =
* Fixed: Compatibility issues with PHP versions * Fixed: Compatibility issues with PHP versions
* Preventative: Security improvements * Preventative: Security improvements