diff --git a/projects/plugins/jetpack/changelog/remove-cleanup-infinite-scroll b/projects/plugins/jetpack/changelog/remove-cleanup-infinite-scroll new file mode 100644 index 0000000000000..417d56530d2b2 --- /dev/null +++ b/projects/plugins/jetpack/changelog/remove-cleanup-infinite-scroll @@ -0,0 +1,4 @@ +Significance: minor +Type: other + +Infinite scroll: remove unused code. diff --git a/projects/plugins/jetpack/modules/theme-tools/infinite-scroll.php b/projects/plugins/jetpack/modules/theme-tools/infinite-scroll.php index 57bb1f8b08ac0..be2932d2879c3 100644 --- a/projects/plugins/jetpack/modules/theme-tools/infinite-scroll.php +++ b/projects/plugins/jetpack/modules/theme-tools/infinite-scroll.php @@ -6,46 +6,22 @@ */ /** - * Load theme's infinite scroll annotation file, if present in the IS plugin. - * The `setup_theme` action is used because the annotation files should be using `after_setup_theme` to register support for IS. + * The function doesn't do anything. * - * As released in Jetpack 2.0, a child theme's parent wasn't checked for in the plugin's bundled support, hence the convoluted way the parent is checked for now. + * @deprecated $$next-version$$ * - * @uses is_admin, wp_get_theme, apply_filters - * @action setup_theme - * @return null + * @return void */ -function jetpack_load_infinite_scroll_annotation() { - if ( is_admin() && isset( $_GET['page'] ) && 'jetpack' === $_GET['page'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Function loads theme specific IS file provided by Jetpack if possible. - $theme = wp_get_theme(); - - if ( ! is_a( $theme, 'WP_Theme' ) && ! is_array( $theme ) ) { - return; - } - - /** This filter is already documented in modules/infinite-scroll/infinity.php */ - $customization_file = apply_filters( 'infinite_scroll_customization_file', __DIR__ . "/infinite-scroll/themes/{$theme['Stylesheet']}.php", $theme['Stylesheet'] ); - - if ( is_readable( $customization_file ) ) { - require_once $customization_file; - } elseif ( ! empty( $theme['Template'] ) ) { - $customization_file = __DIR__ . "/infinite-scroll/themes/{$theme['Template']}.php"; - - if ( is_readable( $customization_file ) ) { - require_once $customization_file; - } - } - } -} -add_action( 'setup_theme', 'jetpack_load_infinite_scroll_annotation' ); +function jetpack_load_infinite_scroll_annotation() {} /** * Prevent IS from being activated if theme doesn't support it * + * @deprecated $$next-version$$ The function is no longer in use. + * * @filter jetpack_can_activate_infinite-scroll * @return bool */ function jetpack_can_activate_infinite_scroll() { return (bool) current_theme_supports( 'infinite-scroll' ); } -add_filter( 'jetpack_can_activate_infinite-scroll', 'jetpack_can_activate_infinite_scroll' );