diff --git a/composer.json b/composer.json index 589ab6f..be455f2 100644 --- a/composer.json +++ b/composer.json @@ -25,10 +25,10 @@ "bjeavons/zxcvbn-php": "^1.4.2", "altis/browser-security": "^2.1.0", "humanmade/disable-accounts": "^0.2.2", - "humanmade/php-basic-auth": "^1.1.7", + "humanmade/php-basic-auth": "dev-20251120-update-dependencies", "humanmade/require-login": "~1.0.5", "humanmade/two-factor": "^0.3.3", - "xwp/stream": "^4.0.2" + "xwp/stream": "dev-master" }, "extra": { "altis": { diff --git a/inc/stream/namespace.php b/inc/stream/namespace.php index 4b0cf71..c137f25 100644 --- a/inc/stream/namespace.php +++ b/inc/stream/namespace.php @@ -39,8 +39,14 @@ function bootstrap() { add_filter( 'site_option_wp_stream_network', __NAMESPACE__ . '\\default_stream_network_options' ); add_filter( 'default_site_option_wp_stream_network', __NAMESPACE__ . '\\default_stream_network_options' ); add_action( 'network_admin_menu', __NAMESPACE__ . '\\remove_stream_admin_pages', 11 ); + add_action( 'admin_menu', __NAMESPACE__ . '\\remove_action_scheduler_menu', 11 ); add_action( 'admin_bar_menu', __NAMESPACE__ . '\\override_network_admin_bar_menu', 100 ); add_filter( 'wp_stream_record_array', __NAMESPACE__ . '\\filter_wp_stream_record_array', 10, 1 ); + + // Initialise Action Scheduler first so Stream can initialise. + require_once Altis\ROOT_DIR . '/vendor/xwp/stream/vendor/woocommerce/action-scheduler/action-scheduler.php'; + action_scheduler_register_3_dot_8_dot_1(); + action_scheduler_initialize_3_dot_8_dot_1(); require_once Altis\ROOT_DIR . '/vendor/xwp/stream/stream.php'; } @@ -83,6 +89,13 @@ function remove_stream_admin_pages() { remove_submenu_page( $wp_stream->admin->records_page_slug, $wp_stream->admin->network->network_settings_page_slug ); } +/** + * Remove the Action Scheduler admin page. + */ +function remove_action_scheduler_menu() { + remove_submenu_page( 'tools.php', 'action-scheduler' ); +} + /** * Override the Stream admin bar menu. *