Changeset 47886

Timestamp:

06/02/2020 05:03:06 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Bundled Themes: Consistently check for WP_Error before outputting get_the_tag_list().

Some themes already had these checks in place as a result of [41756], but not others.

Props sixhours, davidakennedy, SergeyBiryukov.
Fixes #39860.

Location:

trunk/src/wp-content/themes

Files:

• twentyeleven/content-featured.php (modified) (2 diffs)
• twentyeleven/content-gallery.php (modified) (2 diffs)
• twentyeleven/content-image.php (modified) (2 diffs)
• twentyeleven/content-quote.php (modified) (2 diffs)
• twentyeleven/content-single.php (modified) (2 diffs)
• twentyeleven/content.php (modified) (2 diffs)
• twentynineteen/inc/template-tags.php (modified) (1 diff)
• twentyten/functions.php (modified) (2 diffs)
• twentyten/loop.php (modified) (2 diffs)
• twentythirteen/functions.php (modified) (1 diff)
• twentytwelve/functions.php (modified) (3 diffs)

trunk/src/wp-content/themes/twentyeleven/content-featured.php

@@ -34 +34 @@
         <?php
         /* translators: Used between list items, there is a space after the comma. */
-        $tag_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
+        $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
 
-        if ( '' !== $tag_list ) {
+        if ( $tags_list && ! is_wp_error( $tags_list ) ) {
             /* translators: 1: Category list, 2: Tag list, 3: Post permalink, 4: Post title. */
             $utility_text = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
@@ -48 +48 @@
             /* translators: Used between list items, there is a space after the comma. */
             get_the_category_list( __( ', ', 'twentyeleven' ) ),
-            $tag_list,
+            $tags_list,
             esc_url( get_permalink() ),
             the_title_attribute( 'echo=0' )

trunk/src/wp-content/themes/twentyeleven/content-gallery.php

@@ -71 +71 @@
     <footer class="entry-meta">
         <?php $show_sep = false; ?>
+
         <?php
-            /* translators: Used between list items, there is a space after the comma. */
-            $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
+        /* translators: Used between list items, there is a space after the comma. */
+        $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
+
         if ( $categories_list ) :
             ?>
@@ -84 +86 @@
         </span>
         <?php endif; // End if categories. ?>
+
         <?php
-            /* translators: Used between list items, there is a space after the comma. */
-            $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
-        if ( $tags_list ) :
+        /* translators: Used between list items, there is a space after the comma. */
+        $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
+
+        if ( $tags_list && ! is_wp_error( $tags_list ) ) :
             if ( $show_sep ) :
                 ?>

trunk/src/wp-content/themes/twentyeleven/content-image.php

@@ -56 +56 @@
             <div class="entry-meta">
                 <?php
-                    /* translators: Used between list items, there is a space after the comma. */
-                    $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
+                /* translators: Used between list items, there is a space after the comma. */
+                $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
+
                 if ( $categories_list ) :
                     ?>
@@ -67 +68 @@
                 </span>
                 <?php endif; // End if categories. ?>
+
                 <?php
-                    /* translators: Used between list items, there is a space after the comma. */
-                    $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
-                if ( $tags_list ) :
+                /* translators: Used between list items, there is a space after the comma. */
+                $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
+
+                if ( $tags_list && ! is_wp_error( $tags_list ) ) :
                     ?>
                 <span class="tag-links">

trunk/src/wp-content/themes/twentyeleven/content-quote.php

@@ -47 +47 @@
         <footer class="entry-meta">
             <?php $show_sep = false; ?>
+
             <?php
-                /* translators: Used between list items, there is a space after the comma. */
-                $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
+            /* translators: Used between list items, there is a space after the comma. */
+            $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
+
             if ( $categories_list ) :
                 ?>
@@ -60 +62 @@
             </span>
             <?php endif; // End if categories. ?>
+
             <?php
-                /* translators: Used between list items, there is a space after the comma. */
-                $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
-            if ( $tags_list ) :
+            /* translators: Used between list items, there is a space after the comma. */
+            $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
+
+            if ( $tags_list && ! is_wp_error( $tags_list ) ) :
                 if ( $show_sep ) :
                     ?>

trunk/src/wp-content/themes/twentyeleven/content-single.php

@@ -38 +38 @@
 
         /* translators: Used between list items, there is a space after the comma. */
-        $tag_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
+        $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
 
-        if ( '' !== $tag_list ) {
+        if ( $tags_list && ! is_wp_error( $tags_list ) ) {
             /* translators: 1: Categories list, 2: Tag list, 3: Permalink, 4: Post title, 5: Author name, 6: Author URL. */
             $utility_text = __( 'This entry was posted in %1$s and tagged %2$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
-        } elseif ( '' !== $categories_list ) {
+        } elseif ( $categories_list ) {
             /* translators: 1: Categories list, 2: Tag list, 3: Permalink, 4: Post title, 5: Author name, 6: Author URL. */
             $utility_text = __( 'This entry was posted in %1$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
@@ -54 +54 @@
             $utility_text,
             $categories_list,
-            $tag_list,
+            $tags_list,
             esc_url( get_permalink() ),
             the_title_attribute( 'echo=0' ),

trunk/src/wp-content/themes/twentyeleven/content.php

@@ -53 +53 @@
         <footer class="entry-meta">
             <?php $show_sep = false; ?>
+
             <?php if ( is_object_in_taxonomy( get_post_type(), 'category' ) ) : // Hide category text when not supported. ?>
                 <?php
                 /* translators: Used between list items, there is a space after the comma. */
                 $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
+
                 if ( $categories_list ) :
                     ?>
@@ -68 +70 @@
                 <?php endif; // End if categories. ?>
             <?php endif; // End if is_object_in_taxonomy( get_post_type(), 'category' ). ?>
+
             <?php if ( is_object_in_taxonomy( get_post_type(), 'post_tag' ) ) : // Hide tag text when not supported. ?>
                 <?php
                 /* translators: Used between list items, there is a space after the comma. */
                 $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
-                if ( $tags_list ) :
+
+                if ( $tags_list && ! is_wp_error( $tags_list ) ) :
                     if ( $show_sep ) :
                         ?>

trunk/src/wp-content/themes/twentynineteen/inc/template-tags.php

@@ -97 +97 @@
             /* translators: Used between list items, there is a space after the comma. */
             $tags_list = get_the_tag_list( '', __( ', ', 'twentynineteen' ) );
-            if ( $tags_list ) {
+            if ( $tags_list && ! is_wp_error( $tags_list ) ) {
                 printf(
                     /* translators: 1: SVG icon. 2: Posted in label, only visible to screen readers. 3: List of tags. */

trunk/src/wp-content/themes/twentyten/functions.php

@@ -631 +631 @@
     function twentyten_posted_in() {
         // Retrieves tag list of current post, separated by commas.
-        $tag_list = get_the_tag_list( '', ', ' );
-        if ( $tag_list && ! is_wp_error( $tag_list ) ) {
+        $tags_list = get_the_tag_list( '', ', ' );
+
+        if ( $tags_list && ! is_wp_error( $tags_list ) ) {
             /* translators: 1: Category name, 2: Tag name, 3: Post permalink, 4: Post title. */
             $posted_in = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
@@ -642 +643 @@
             $posted_in = __( 'Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
         }
+
         // Prints the string, replacing the placeholders.
         printf(
             $posted_in,
             get_the_category_list( ', ' ),
-            $tag_list,
+            $tags_list,
             get_permalink(),
             the_title_attribute( 'echo=0' )

trunk/src/wp-content/themes/twentyten/loop.php

@@ -177 +177 @@
                     <span class="meta-sep">|</span>
                 <?php endif; ?>
+
                 <?php
-                    $tags_list = get_the_tag_list( '', ', ' );
-                if ( $tags_list ) :
+                $tags_list = get_the_tag_list( '', ', ' );
+                if ( $tags_list && ! is_wp_error( $tags_list ) ) :
                     ?>
                 <span class="tag-links">
@@ -189 +190 @@
                 <span class="meta-sep">|</span>
                 <?php endif; ?>
+
                 <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
+
                 <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
             </div><!-- .entry-utility -->

trunk/src/wp-content/themes/twentythirteen/functions.php

@@ -490 +490 @@
 
         /* translators: Used between list items, there is a space after the comma. */
-        $tag_list = get_the_tag_list( '', __( ', ', 'twentythirteen' ) );
-        if ( $tag_list ) {
-            echo '<span class="tags-links">' . $tag_list . '</span>';
+        $tags_list = get_the_tag_list( '', __( ', ', 'twentythirteen' ) );
+        if ( $tags_list && ! is_wp_error( $tags_list ) ) {
+            echo '<span class="tags-links">' . $tags_list . '</span>';
         }
 

trunk/src/wp-content/themes/twentytwelve/functions.php

@@ -502 +502 @@
 
         /* translators: Used between list items, there is a space after the comma. */
-        $tag_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
+        $tags_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
 
         $date = sprintf(
@@ -520 +520 @@
         );
 
-        if ( $tag_list ) {
+        if ( $tags_list && ! is_wp_error( $tags_list ) ) {
             /* translators: 1: Category name, 2: Tag name, 3: Date, 4: Author display name. */
             $utility_text = __( 'This entry was posted in %1$s and tagged %2$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
@@ -534 +534 @@
             $utility_text,
             $categories_list,
-            $tag_list,
+            $tags_list,
             $date,
             $author