Changeset 47886 for trunk/src/wp-content/themes/twentyten

Timestamp:

06/02/2020 05:03:06 PM (6 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/twentyten

Files:

• functions.php (modified) (2 diffs)
• loop.php (modified) (2 diffs)

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 -->