Settings: Only initiate table that's needed (#1951)

Author: obenland

includes/wp-admin/class-admin.php

@@ -107,6 +107,22 @@ public static function following_list_page() {
 		}
 	}
 
+	/**
+	 * Creates the followers and following list tables in ActivityPub settings.
+	 */
+	public static function add_settings_list_tables() {
+		$tab = \sanitize_text_field( \wp_unslash( $_GET['tab'] ?? 'welcome' ) ); // phpcs:ignore WordPress.Security.NonceVerification
+
+		switch ( $tab ) {
+			case 'followers':
+				self::add_followers_list_table();
+				break;
+			case 'following':
+				self::add_following_list_table();
+				break;
+		}
+	}
+
 	/**
 	 * Creates the followers list table.
 	 */

includes/wp-admin/class-menu.php

@@ -28,8 +28,7 @@ public static function admin_menu() {
 
 		\add_action( 'load-' . $settings_page, array( Settings::class, 'add_settings_help_tab' ) );
 		\add_action( 'load-users.php', array( Settings::class, 'add_users_help_tab' ) );
-		\add_action( 'load-' . $settings_page, array( Admin::class, 'add_followers_list_table' ) );
-		\add_action( 'load-' . $settings_page, array( Admin::class, 'add_following_list_table' ) );
+		\add_action( 'load-' . $settings_page, array( Admin::class, 'add_settings_list_tables' ) );
 		\add_action( 'load-' . $settings_page, array( Screen_Options::class, 'add_settings_list_options' ) );
 
 		// User has to be able to publish posts.