| @@ -233,9 +233,9 @@ | ||
| 233 | 233 | 'gzip_enabled' => ! empty( $gzip['gzip_enabled'] ), |
| 234 | 234 | 'lazy_images' => ! empty( $lazy['lazy_images'] ), |
| 235 | 235 | 'browser_cache' => ! empty( $browser['enabled'] ), |
| 236 | 236 | 'resource_hints' => ! empty( $hints['enabled'] ), |
| 237 | - 'cache_expiry' => isset( $cache['cache_expiry'] ) ? absint( $cache['cache_expiry'] ) : 24, | |
| 237 | + 'cache_expiry' => isset( $cache['cache_expiry'] ) ? absint( $cache['cache_expiry'] ) : \XSpeed\Modules\Cache\CacheModule::DEFAULT_EXPIRY_HOURS, | |
| 238 | 238 | ); |
| 239 | 239 | } |
| 240 | 240 | |
| 241 | 241 | /** |
| @@ -366,12 +366,16 @@ | ||
| 366 | 366 | array( 'enabled' => ! empty( $params['resource_hints'] ) ) |
| 367 | 367 | ); |
| 368 | 368 | } |
| 369 | 369 | |
| 370 | - // Opt-in usage analytics. Only acted on when the key is present in the | |
| 371 | - // payload (legacy onboarding-complete sites are left untouched). The | |
| 372 | - // consent toggle defaults OFF in the wizard, so the common path is | |
| 373 | - // usage_tracking=false → tracker stays dormant, no outbound HTTP. | |
| 370 | + // Usage analytics consent. Only acted on when the key is present in | |
| 371 | + // the payload (legacy onboarding-complete sites are left untouched). | |
| 372 | + // The wizard toggle ships pre-checked, so the common path is | |
| 373 | + // usage_tracking=true → opt_in(true) registers the install. Nothing | |
| 374 | + // is sent before the admin clicks Apply. (#437 shipped it off; later | |
| 375 | + // reverted to pre-checked by product decision. The same consent is | |
| 376 | + // also writable from Settings → Privacy & usage data, via | |
| 377 | + // PrivacyModule, which routes through the same opt_in().) | |
| 374 | 378 | if ( array_key_exists( 'usage_tracking', $params ) ) { |
| 375 | 379 | $tracker = Plugin::instance()->usage_tracker(); |
| 376 | 380 | if ( $tracker ) { |
| 377 | 381 | $tracker->opt_in( ! empty( $params['usage_tracking'] ) ); |
| @@ -378,9 +382,8 @@ | ||
| 378 | 382 | } |
| 379 | 383 | } |
| 380 | 384 | |
| 381 | 385 | $install_state = Cache::toggle( $want_cache ); |
| 382 | - Settings::update( array( 'cache_enabled' => $install_state['enabled'] ) ); | |
| 383 | 386 | |
| 384 | 387 | // Recompute the unified nginx block AFTER cache_enabled is persisted. |
| 385 | 388 | // Cache::toggle() computes it inline, before the Settings::update() |
| 386 | 389 | // above writes cache_enabled — so the block in $install_state reflects |
