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

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

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