Merge branch 'master' of github.com:Automattic/themes

altofocus/inc/extras.php

@@ -139,6 +139,12 @@ add_action( 'wp_head', 'altofocus_pingback_header' );
 function altofocus_slideshow_gallery_filter( $output, $attr ) {
 
 	global $post;
+	
+	static $count = 0;
+	
+	if ( $count > 0 ) {
+		return $output; // Ensure the gallery output is replaced once.
+	}
 
 	static $instance = 0;
 	$instance++;
@@ -222,5 +228,8 @@ function altofocus_slideshow_gallery_filter( $output, $attr ) {
 	}
 
 	$output .= '</section>';
+	
+	$count++; // Update counter after successful replacement.
+	
 	return $output;
-}
+}

radcliffe-2/inc/template-tags.php

@@ -66,14 +66,14 @@ function radcliffe_2_entry_footer() {
 	if ( 'post' === get_post_type() ) {
 		/* translators: used between list items, there is a space after the comma */
 		$categories_list = get_the_category_list( esc_html__( ', ', 'radcliffe-2' ) );
-		if ( $categories_list ) {
+		if ( $categories_list && ! is_wp_error( $categories_list ) ) {
 			/* translators: 1: list of categories. */
 			echo '<span class="cat-links">' . radcliffe_2_get_svg( array( 'icon' => 'category', 'title' => esc_html__( 'Categories', 'radcliffe-2' ) ) ) . $categories_list . '</span>';
 		}
 
 		/* translators: used between list items, there is a space after the comma */
 		$tags_list = get_the_tag_list( '', esc_html_x( ', ', 'list item separator', 'radcliffe-2' ) );
-		if ( $tags_list ) {
+		if ( $tags_list && ! is_wp_error( $tags_list ) ) {
 			/* translators: 1: list of tags. */
 			echo '<span class="tags-links">' . radcliffe_2_get_svg( array( 'icon' => 'tag', 'title' => esc_html__( 'Tags', 'radcliffe-2' ) ) ) . $tags_list . '</span>';
 		}

scratchpad/inc/custom-header.php

@@ -65,7 +65,8 @@ function scratchpad_header_style() {
 		// If the user has set a custom color for the text use that.
 		else :
 	?>
-		.site-title a {
+		#masthead .site-title a,
+		#masthead .site-description {
 			color: #<?php echo esc_attr( $header_text_color ); ?>;
 		}
 	<?php endif; ?>

scratchpad/style.css

@@ -4,7 +4,7 @@ Theme URI: http://theme.wordpress.com/themes/scratchpad
 Author: Automattic
 Author URI: http://wordpress.com/themes
 Description: A colorful theme for collecting your ideas.
-Version: 1.0.5-wpcom
+Version: 1.0.6-wpcom
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: scratchpad