| @@ -3,8 +3,9 @@ | ||
| 3 | 3 | |
| 4 | 4 | class Install { |
| 5 | 5 | /** |
| 6 | 6 | * Hold Plugin class |
| 7 | + * | |
| 7 | 8 | * @var Plugin |
| 8 | 9 | */ |
| 9 | 10 | public $plugin; |
| 10 | 11 | |
| @@ -96,9 +97,11 @@ | ||
| 96 | 97 | |
| 97 | 98 | if ( ! $update ) { |
| 98 | 99 | $this->update_required = true; |
| 99 | 100 | $this->success_db = $this->update( |
| 100 | - $this->db_version, $this->plugin->get_version(), array( | |
| 101 | + $this->db_version, | |
| 102 | + $this->plugin->get_version(), | |
| 103 | + array( | |
| 101 | 104 | 'type' => 'auto', |
| 102 | 105 | ) |
| 103 | 106 | ); |
| 104 | 107 | } |
| @@ -104,9 +107,11 @@ | ||
| 104 | 107 | } |
| 105 | 108 | |
| 106 | 109 | if ( 'update_and_continue' === $update ) { |
| 107 | 110 | $this->success_db = $this->update( |
| 108 | - $this->db_version, $this->plugin->get_version(), array( | |
| 111 | + $this->db_version, | |
| 112 | + $this->plugin->get_version(), | |
| 113 | + array( | |
| 109 | 114 | 'type' => 'user', |
| 110 | 115 | ) |
| 111 | 116 | ); |
| 112 | 117 | } |
| @@ -176,9 +181,9 @@ | ||
| 176 | 181 | esc_html( implode( ', ', $missing_tables ) ) |
| 177 | 182 | ); |
| 178 | 183 | } |
| 179 | 184 | |
| 180 | - if ( is_plugin_active_for_network( $this->plugin->locations['plugin'] ) && current_user_can( 'manage_network_plugins' ) ) { | |
| 185 | + if ( $this->plugin->is_network_activated() && current_user_can( 'manage_network_plugins' ) ) { | |
| 181 | 186 | $uninstall_message = sprintf( |
| 182 | 187 | // translators: Placeholders refer to HTML Link tags (e.g. "<a href="https://foo.com/wp-admin/">") |
| 183 | 188 | __( 'Please %1$suninstall%2$s the Stream plugin and activate it again.', 'stream' ), |
| 184 | 189 | '<a href="' . network_admin_url( 'plugins.php#stream' ) . '">', |
| @@ -218,9 +223,9 @@ | ||
| 218 | 223 | } |
| 219 | 224 | |
| 220 | 225 | $plugin = plugin_basename( $file ); |
| 221 | 226 | |
| 222 | - if ( is_plugin_active_for_network( $plugin ) ) { | |
| 227 | + if ( $this->plugin->is_network_activated() ) { | |
| 223 | 228 | $current_versions = get_site_option( $this->option_key . '_connectors', array() ); |
| 224 | 229 | $network = true; |
| 225 | 230 | } elseif ( is_plugin_active( $plugin ) ) { |
| 226 | 231 | $current_versions = get_option( $this->option_key . '_connectors', array() ); |
