| @@ -51,10 +51,11 @@ | ||
| 51 | 51 | $sites_details = array(); |
| 52 | 52 | if ( $is_network_activation ) { |
| 53 | 53 | $all_sites = Freemius::get_sites(); |
| 54 | 54 | |
| 55 | - $subsite_data_by_install_id = array(); | |
| 56 | - $install_url_by_install_id = array(); | |
| 55 | + $all_site_details = array(); | |
| 56 | + $subsite_url_by_install_id = array(); | |
| 57 | + $install_url_by_install_id = array(); | |
| 57 | 58 | |
| 58 | 59 | foreach ( $all_sites as $site ) { |
| 59 | 60 | $site_details = $fs->get_site_info( $site ); |
| 60 | 61 | |
| @@ -65,11 +66,11 @@ | ||
| 65 | 66 | $blog_id = Freemius::get_site_blog_id( $site ); |
| 66 | 67 | $install = $fs->get_install_by_blog_id($blog_id); |
| 67 | 68 | |
| 68 | 69 | if ( is_object( $install ) ) { |
| 69 | - if ( isset( $subsite_data_by_install_id[ $install->id ] ) ) { | |
| 70 | - $clone_subsite_data = $subsite_data_by_install_id[ $install->id ]; | |
| 71 | - $clone_install_url = $install_url_by_install_id[ $install->id ]; | |
| 70 | + if ( isset( $subsite_url_by_install_id[ $install->id ] ) ) { | |
| 71 | + $clone_subsite_url = $subsite_url_by_install_id[ $install->id ]; | |
| 72 | + $clone_install_url = $install_url_by_install_id[ $install->id ]; | |
| 72 | 73 | |
| 73 | 74 | if ( |
| 74 | 75 | /** |
| 75 | 76 | * If we already have an install with the same URL as the subsite it's stored in, skip the current subsite. Otherwise, replace the existing install's data with the current subsite's install's data if the URLs match. |
| @@ -76,9 +77,9 @@ | ||
| 76 | 77 | * |
| 77 | 78 | * @author Leo Fajardo (@leorw) |
| 78 | 79 | * @since 2.5.0 |
| 79 | 80 | */ |
| 80 | - fs_strip_url_protocol( untrailingslashit( $clone_install_url ) ) === fs_strip_url_protocol( untrailingslashit( $clone_subsite_data['url'] ) ) || | |
| 81 | + fs_strip_url_protocol( untrailingslashit( $clone_install_url ) ) === fs_strip_url_protocol( untrailingslashit( $clone_subsite_url ) ) || | |
| 81 | 82 | fs_strip_url_protocol( untrailingslashit( $install->url ) ) !== fs_strip_url_protocol( untrailingslashit( $site_details['url'] ) ) |
| 82 | 83 | ) { |
| 83 | 84 | continue; |
| 84 | 85 | } |
| @@ -87,17 +88,19 @@ | ||
| 87 | 88 | if ( FS_Plugin_License::is_valid_id( $install->license_id ) ) { |
| 88 | 89 | $site_details['license_id'] = $install->license_id; |
| 89 | 90 | } |
| 90 | 91 | |
| 91 | - $subsite_data_by_install_id[ $install->id ] = $site_details; | |
| 92 | - $install_url_by_install_id[ $install->id ] = $install->url; | |
| 92 | + $subsite_url_by_install_id[ $install->id ] = $site_details['url']; | |
| 93 | + $install_url_by_install_id[ $install->id ] = $install->url; | |
| 93 | 94 | } |
| 95 | + | |
| 96 | + $all_site_details[] = $site_details; | |
| 94 | 97 | } |
| 95 | 98 | |
| 96 | 99 | if ( $is_network_activation ) { |
| 97 | 100 | $vars = array( |
| 98 | 101 | 'id' => $fs->get_id(), |
| 99 | - 'sites' => array_values( $subsite_data_by_install_id ), | |
| 102 | + 'sites' => $all_site_details, | |
| 100 | 103 | 'require_license_key' => true |
| 101 | 104 | ); |
| 102 | 105 | |
| 103 | 106 | $network_activation_html = fs_get_template( 'partials/network-activation.php', $vars ); |
| @@ -887,4 +890,6 @@ | ||
| 887 | 890 | } |
| 888 | 891 | }); |
| 889 | 892 | })( jQuery ); |
| 890 | 893 | </script> |
| 894 | +<?php | |
| 895 | + fs_require_once_template( 'api-connectivity-message-js.php' ); | |
