Merge branch 'trunk' into 56791-coding-standards

src/wp-admin/includes/template.php

@@ -1784,12 +1784,11 @@ function do_settings_sections( $page ) {
 			call_user_func( $section['callback'], $section );
 		}
 
-		if ( ! isset( $wp_settings_fields ) || ! isset( $wp_settings_fields[ $page ] ) || ! isset( $wp_settings_fields[ $page ][ $section['id'] ] ) ) {
-			continue;
+		if ( isset( $wp_settings_fields[ $page ][ $section['id'] ] ) ) {
+			echo '<table class="form-table" role="presentation">';
+			do_settings_fields( $page, $section['id'] );
+			echo '</table>';
 		}
-		echo '<table class="form-table" role="presentation">';
-		do_settings_fields( $page, $section['id'] );
-		echo '</table>';
 
 		if ( '' !== $section['after_section'] ) {
 			echo wp_kses_post( $section['after_section'] );

src/wp-includes/ms-functions.php

@@ -78,15 +78,16 @@ function get_active_blog_for_user( $user_id ) {
 		$ret   = false;
 		if ( is_array( $blogs ) && count( $blogs ) > 0 ) {
 			foreach ( (array) $blogs as $blog_id => $blog ) {
-				if ( get_current_network_id() !== (int) $blog->site_id ) {
+				if ( get_current_network_id() !== $blog->site_id ) {
 					continue;
 				}
+
 				$details = get_site( $blog_id );
 				if ( is_object( $details )
 					&& '0' === $details->archived && '0' === $details->spam && '0' === $details->deleted
 				) {
 					$ret = $details;
-					if ( (int) get_user_meta( $user_id, 'primary_blog', true ) !== (int) $blog_id ) {
+					if ( (int) get_user_meta( $user_id, 'primary_blog', true ) !== $blog_id ) {
 						update_user_meta( $user_id, 'primary_blog', $blog_id );
 					}
 					if ( ! get_user_meta( $user_id, 'source_domain', true ) ) {

src/wp-includes/post.php

@@ -1146,7 +1146,7 @@ function get_post_ancestors( $post ) {
 
 	while ( $ancestor = get_post( $id ) ) {
 		// Loop detection: If the ancestor has been seen before, break.
-		if ( empty( $ancestor->post_parent ) || ( $ancestor->post_parent === $post->ID )
+		if ( empty( $ancestor->post_parent ) || $ancestor->post_parent === $post->ID
 			|| in_array( $ancestor->post_parent, $ancestors, true )
 		) {
 			break;

tests/phpunit/tests/admin/includesTemplate.php

@@ -240,6 +240,30 @@ public function test_add_settings_section_with_extra_args( $extra_args, $expecte
 		$this->assertStringContainsString( $expected_after_section_html, $output, 'Test page output does not contain the custom markup to be placed after the section.' );
 	}
 
+	/**
+	 * @ticket 62746
+	 *
+	 * @param array  $extra_args                   Extra arguments to pass to function `add_settings_section()`.
+	 * @param array  $expected_section_data        Expected set of section data.
+	 * @param string $expected_before_section_html Expected HTML markup to be rendered before the settings section.
+	 * @param string $expected_after_section_html  Expected HTML markup to be rendered after the settings section.
+	 *
+	 * @covers ::add_settings_section
+	 * @covers ::do_settings_sections
+	 *
+	 * @dataProvider data_extra_args_for_add_settings_section
+	 */
+	public function test_add_settings_section_without_any_fields( $extra_args, $expected_section_data, $expected_before_section_html, $expected_after_section_html ) {
+		add_settings_section( 'test-section', 'Section title', '__return_false', 'test-page', $extra_args );
+
+		ob_start();
+		do_settings_sections( 'test-page' );
+		$output = ob_get_clean();
+
+		$this->assertStringContainsString( $expected_before_section_html, $output, 'Test page output does not contain the custom markup to be placed before the section.' );
+		$this->assertStringContainsString( $expected_after_section_html, $output, 'Test page output does not contain the custom markup to be placed after the section.' );
+	}
+
 	/**
 	 * Data provider for `test_add_settings_section_with_extra_args()`.
 	 *