WordPress.org

Make WordPress Core

Ticket #21479: 21479.5.diff

File 21479.5.diff, 1.4 KB (added by obenland, 6 years ago)
  • wp-content/themes/twentytwelve/functions.php

     
    314314        );
    315315
    316316        // Translators: 1 is category, 2 is tag, 3 is the date and 4 is the author's name.
    317         if ( '' != $tag_list ) {
     317        if ( $tag_list ) {
    318318                $utility_text = __( 'This entry was posted in %1$s and tagged %2$s on %3$s by %4$s.', 'twentytwelve' );
    319         } elseif ( ! empty( $categories_list ) && twentytwelve_is_categorized_site() ) {
     319        } elseif ( $categories_list && twentytwelve_is_categorized_site() ) {
    320320                $utility_text = __( 'This entry was posted in %1$s on %3$s by %4$s.', 'twentytwelve' );
    321321        } else {
    322322                $utility_text = __( 'This entry was posted on %3$s by %4$s.', 'twentytwelve' );
     
    337337 * Returns true if a blog has more than one category.
    338338 *
    339339 * @since Twenty Twelve 1.0
     340 *
     341 * @return bool Whether blog has more than one category
    340342 */
    341343function twentytwelve_is_categorized_site() {
    342         $non_empty_categories = get_categories( array(
     344        $non_empty_categories = wp_count_terms( 'category', array(
    343345                'hide_empty' => 1,
    344346        ) );
    345347
    346         if ( is_wp_error( $non_empty_categories ) || empty( $non_empty_categories ) || count( $non_empty_categories ) < 1 )
    347                 return false;
    348 
    349         return true;
     348        return ( ! is_wp_error( $non_empty_categories ) && $non_empty_categories > 1 );
    350349}
    351350endif;
    352351