Chore: Code improvements to block PHP files. (#17288)

WordPress · Sep 2, 2019 · f1b2f29 · f1b2f29
1 parent 8213431
commit f1b2f29
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 38 deletions.
diff --git a/packages/block-library/src/archives/index.php b/packages/block-library/src/archives/index.php
@@ -72,48 +72,44 @@ function render_block_core_archives( $attributes ) {
 	<select id="' . $dropdown_id . '" name="archive-dropdown" onchange="document.location.href=this.options[this.selectedIndex].value;">
 	<option value="">' . $label . '</option>' . $archives . '</select>';
 
-		$block_content = sprintf(
+		return sprintf(
 			'<div class="%1$s">%2$s</div>',
 			esc_attr( $class ),
 			$block_content
 		);
-	} else {
-
-		$class .= ' wp-block-archives-list';
+	}
 
-		/** This filter is documented in wp-includes/widgets/class-wp-widget-archives.php */
-		$archives_args = apply_filters(
-			'widget_archives_args',
-			array(
-				'type'            => 'monthly',
-				'show_post_count' => $show_post_count,
-			)
-		);
+	$class .= ' wp-block-archives-list';
 
-		$archives_args['echo'] = 0;
+	/** This filter is documented in wp-includes/widgets/class-wp-widget-archives.php */
+	$archives_args = apply_filters(
+		'widget_archives_args',
+		array(
+			'type'            => 'monthly',
+			'show_post_count' => $show_post_count,
+		)
+	);
 
-		$archives = wp_get_archives( $archives_args );
+	$archives_args['echo'] = 0;
 
-		$classnames = esc_attr( $class );
+	$archives = wp_get_archives( $archives_args );
 
-		if ( empty( $archives ) ) {
+	$classnames = esc_attr( $class );
 
-			$block_content = sprintf(
-				'<div class="%1$s">%2$s</div>',
-				$classnames,
-				__( 'No archives to show.' )
-			);
-		} else {
+	if ( empty( $archives ) ) {
 
-			$block_content = sprintf(
-				'<ul class="%1$s">%2$s</ul>',
-				$classnames,
-				$archives
-			);
-		}
+		return sprintf(
+			'<div class="%1$s">%2$s</div>',
+			$classnames,
+			__( 'No archives to show.' )
+		);
 	}
 
-	return $block_content;
+	return sprintf(
+		'<ul class="%1$s">%2$s</ul>',
+		$classnames,
+		$archives
+	);
 }
 
 /**

diff --git a/packages/block-library/src/categories/index.php b/packages/block-library/src/categories/index.php
@@ -51,13 +51,11 @@ function render_block_core_categories( $attributes ) {
 		$class .= " {$attributes['className']}";
 	}
 
-	$block_content = sprintf(
+	return sprintf(
 		$wrapper_markup,
 		esc_attr( $class ),
 		$items_markup
 	);
-
-	return $block_content;
 }
 
 /**

diff --git a/packages/block-library/src/latest-comments/index.php b/packages/block-library/src/latest-comments/index.php
@@ -137,7 +137,7 @@ function render_block_core_latest_comments( $attributes = array() ) {
 	}
 	$classnames = esc_attr( $class );
 
-	$block_content = ! empty( $comments ) ? sprintf(
+	return ! empty( $comments ) ? sprintf(
 		'<ol class="%1$s">%2$s</ol>',
 		$classnames,
 		$list_items_markup
@@ -146,8 +146,6 @@ function render_block_core_latest_comments( $attributes = array() ) {
 		$classnames,
 		__( 'No comments to show.' )
 	);
-
-	return $block_content;
 }
 
 /**

diff --git a/packages/block-library/src/latest-posts/index.php b/packages/block-library/src/latest-posts/index.php
@@ -108,13 +108,11 @@ function render_block_core_latest_posts( $attributes ) {
 		$class .= ' ' . $attributes['className'];
 	}
 
-	$block_content = sprintf(
+	return sprintf(
 		'<ul class="%1$s">%2$s</ul>',
 		esc_attr( $class ),
 		$list_items_markup
 	);
-
-	return $block_content;
 }
 
 /**