| @@ -15,9 +15,9 @@ | ||
| 15 | 15 | die; |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | - * Admin Columns Class. | |
| 19 | + * Handles plugin activation and creation of the Top 10 database tables. | |
| 20 | 20 | * |
| 21 | 21 | * @since 3.3.0 |
| 22 | 22 | */ |
| 23 | 23 | class Activator { |
| @@ -74,8 +74,9 @@ | ||
| 74 | 74 | * WPMU is disabled or plugin is |
| 75 | 75 | * activated on an individual blog. |
| 76 | 76 | */ |
| 77 | 77 | public static function activation_hook( $network_wide ) { |
| 78 | + Database::clear_table_installation_cache(); | |
| 78 | 79 | |
| 79 | 80 | if ( is_multisite() && $network_wide ) { |
| 80 | 81 | $sites = get_sites( |
| 81 | 82 | array( |
| @@ -123,14 +124,14 @@ | ||
| 123 | 124 | |
| 124 | 125 | if ( $installed_ver != $tptn_db_version ) { // phpcs:ignore Universal.Operators.StrictComparisons.LooseNotEqual |
| 125 | 126 | require_once ABSPATH . 'wp-admin/includes/upgrade.php'; |
| 126 | 127 | |
| 127 | - $wpdb->hide_errors(); | |
| 128 | + $show_errors = $wpdb->hide_errors(); | |
| 128 | 129 | dbDelta( self::create_full_table_sql() ); |
| 129 | 130 | dbDelta( self::create_daily_table_sql() ); |
| 130 | 131 | dbDelta( Database::create_log_table_sql() ); |
| 131 | 132 | dbDelta( Database::create_funnel_table_sql() ); |
| 132 | - $wpdb->show_errors(); | |
| 133 | + $wpdb->show_errors( $show_errors ); | |
| 133 | 134 | |
| 134 | 135 | if ( self::is_all_tables_installed() ) { |
| 135 | 136 | update_site_option( 'tptn_db_version', $tptn_db_version ); |
| 136 | 137 | } |
| @@ -170,11 +171,12 @@ | ||
| 170 | 171 | if ( ! self::is_table_installed( $table_name ) ) { |
| 171 | 172 | require_once ABSPATH . 'wp-admin/includes/upgrade.php'; |
| 172 | 173 | |
| 173 | 174 | global $wpdb; |
| 174 | - $wpdb->hide_errors(); | |
| 175 | + $show_errors = $wpdb->hide_errors(); | |
| 175 | 176 | dbDelta( $sql ); |
| 176 | - $wpdb->show_errors(); | |
| 177 | + $wpdb->show_errors( $show_errors ); | |
| 178 | + Database::clear_table_installation_cache(); | |
| 177 | 179 | } |
| 178 | 180 | } |
| 179 | 181 | |
| 180 | 182 | /** |
| @@ -193,8 +195,9 @@ | ||
| 193 | 195 | self::maybe_create_table( $table_name, self::create_full_table_sql() ); |
| 194 | 196 | self::maybe_create_table( $table_name_daily, self::create_daily_table_sql() ); |
| 195 | 197 | self::maybe_create_table( $table_name_log, Database::create_log_table_sql() ); |
| 196 | 198 | self::maybe_create_table( $table_name_funnel, Database::create_funnel_table_sql() ); |
| 199 | + Database::clear_table_installation_cache(); | |
| 197 | 200 | } |
| 198 | 201 | |
| 199 | 202 | /** |
| 200 | 203 | * Create full table sql. |
| @@ -287,8 +290,9 @@ | ||
| 287 | 290 | $blog = $blog->id; |
| 288 | 291 | } |
| 289 | 292 | |
| 290 | 293 | switch_to_blog( $blog ); |
| 294 | + Database::clear_table_installation_cache(); | |
| 291 | 295 | self::single_activate(); |
| 292 | 296 | restore_current_blog(); |
| 293 | 297 | } |
| 294 | 298 | |
