10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-15 20:53:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed "get_profile_photo_size" function (avoid PHP notice with array_combine )

Browse Source 
- Fixed password reset/change form when other forms are initialized at the same page
  - Fixed getting extension updates on multisites
  - Deprecated JS event 'um_before_modal_removed', use wp.hooks action 'um_before_modal_removed' instead
This commit is contained in:
nikitasinelnikov
2020-07-06 14:20:29 +03:00
parent af4a53a9fb
commit 2dad3d2704
11 changed files with 73 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/class-init.php
+24 -6
View File
@@ -211,6 +211,10 @@ if ( ! class_exists( 'UM' ) ) {
//run activation
register_activation_hook( um_plugin, array( &$this, 'activation' ) );
if ( is_multisite() && ! defined( 'DOING_AJAX' ) ) {
add_action( 'wp_loaded', array( $this, 'maybe_network_activation' ) );
}
// init widgets
add_action( 'widgets_init', array( &$this, 'widgets_init' ) );
@@ -441,11 +445,27 @@ if ( ! class_exists( 'UM' ) ) {
* @since 2.0
*/
function activation() {
$this->single_site_activation();
if ( is_multisite() ) {
if ( ! is_plugin_active_for_network( um_plugin ) ) {
$this->single_site_activation();
} else {
//get all blogs
update_network_option( get_current_network_id(), 'um_maybe_network_wide_activation', 1 );
}
}
/**
* Maybe need multisite activation process
*
* @since 2.1.7
*/
function maybe_network_activation() {
$maybe_activation = get_network_option( get_current_network_id(), 'um_maybe_network_wide_activation' );
if ( $maybe_activation ) {
delete_network_option( get_current_network_id(), 'um_maybe_network_wide_activation' );
if ( is_plugin_active_for_network( um_plugin ) ) {
// get all blogs
$blogs = get_sites();
if ( ! empty( $blogs ) ) {
foreach( $blogs as $blog ) {
@@ -456,8 +476,6 @@ if ( ! class_exists( 'UM' ) ) {
}
}
}
} else {
$this->single_site_activation();
}
}