Make WordPress Core

Ticket #25256: twentyten.2.diff

File twentyten.2.diff, 13.9 KB (added by ericlewis, 12 years ago)
  • src/wp-content/themes/twentyten/archive.php

     
    1818                        <div id="content" role="main">
    1919
    2020<?php
    21         /**
    22          * Queue the first post, that way we know
     21        /* Queue the first post, that way we know
    2322         * what date we're dealing with (if that is the case).
    2423         *
    2524         * We reset this later so we can run the loop
     
    4241                        </h1>
    4342
    4443<?php
    45         /**
    46          * Since we called the_post() above, we need to
     44        /* Since we called the_post() above, we need to
    4745         * rewind the loop back to the beginning that way
    4846         * we can run the loop properly, in full.
    4947         */
    5048        rewind_posts();
    5149
    52         /**
    53          * Run the loop for the archives page to output the posts.
     50        /* Run the loop for the archives page to output the posts.
    5451         * If you want to overload this in a child theme then include a file
    5552         * called loop-archive.php and that will be used instead.
    5653         */
  • src/wp-content/themes/twentyten/attachment.php

     
    1313                        <div id="content" role="main">
    1414
    1515                        <?php
    16                         /**
    17                          * Run the loop to output the attachment.
     16                        /* Run the loop to output the attachment.
    1817                         * If you want to overload this in a child theme then include a file
    1918                         * called loop-attachment.php and that will be used instead.
    2019                         */
  • src/wp-content/themes/twentyten/author.php

     
    1313                        <div id="content" role="main">
    1414
    1515<?php
    16         /**
    17          * Queue the first post, that way we know who
     16        /* Queue the first post, that way we know who
    1817         * the author is when we try to get their name,
    1918         * URL, description, avatar, etc.
    2019         *
     
    5150<?php endif; ?>
    5251
    5352<?php
    54         /**
    55          * Since we called the_post() above, we need to
     53        /* Since we called the_post() above, we need to
    5654         * rewind the loop back to the beginning that way
    5755         * we can run the loop properly, in full.
    5856         */
    5957        rewind_posts();
    6058
    61         /**
    62          * Run the loop for the author archive page to output the authors posts
     59        /* Run the loop for the author archive page to output the authors posts
    6360         * If you want to overload this in a child theme then include a file
    6461         * called loop-author.php and that will be used instead.
    6562         */
  • src/wp-content/themes/twentyten/category.php

     
    2020                                        if ( ! empty( $category_description ) )
    2121                                                echo '<div class="archive-meta">' . $category_description . '</div>';
    2222
    23                                 /**
    24                                  * Run the loop for the category page to output the posts.
     23                                /* Run the loop for the category page to output the posts.
    2524                                 * If you want to overload this in a child theme then include a file
    2625                                 * called loop-category.php and that will be used instead.
    2726                                 */
  • src/wp-content/themes/twentyten/comments.php

     
    1818                                <p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyten' ); ?></p>
    1919                        </div><!-- #comments -->
    2020<?php
    21                 /**
    22                  * Stop the rest of comments.php from being processed,
     21                /* Stop the rest of comments.php from being processed,
    2322                 * but don't kill the script entirely -- we still have
    2423                 * to fully load the template.
    2524                 */
     
    4645
    4746                        <ol class="commentlist">
    4847                                <?php
    49                                         /**
    50                                          * Loop through and list the comments. Tell wp_list_comments()
     48                                        /* Loop through and list the comments. Tell wp_list_comments()
    5149                                         * to use twentyten_comment() to format the comments.
    5250                                         * If you want to overload this in a child theme then you can
    5351                                         * define twentyten_comment() and that will be used instead.
     
    6563<?php endif; // check for comment navigation ?>
    6664
    6765        <?php
    68         /**
    69          * If there are no comments and comments are closed, let's leave a little note, shall we?
     66        /* If there are no comments and comments are closed, let's leave a little note, shall we?
    7067         * But we only want the note on posts and pages that had comments in the first place.
    7168         */
    7269        if ( ! comments_open() && get_comments_number() ) : ?>
  • src/wp-content/themes/twentyten/footer.php

     
    1616                <div id="colophon">
    1717
    1818<?php
    19         /**
    20          * A sidebar in the footer? Yep. You can can customize
     19        /* A sidebar in the footer? Yep. You can can customize
    2120         * your footer with four columns of widgets.
    2221         */
    2322        get_sidebar( 'footer' );
     
    4645</div><!-- #wrapper -->
    4746
    4847<?php
    49         /**
    50          * Always have wp_footer() just before the closing </body>
     48        /* Always have wp_footer() just before the closing </body>
    5149         * tag of your theme, or you will break many plugins, which
    5250         * generally use this hook to reference JavaScript files.
    5351         */
  • src/wp-content/themes/twentyten/functions.php

     
    3838 * @since Twenty Ten 1.0
    3939 */
    4040
    41 /**
    42  * Set the content width based on the theme's design and stylesheet.
     41/* Set the content width based on the theme's design and stylesheet.
    4342 *
    4443 * Used to set the width of images and content. Should be equal to the width the theme
    4544 * is designed for, generally via the style.css stylesheet.
     
    4746if ( ! isset( $content_width ) )
    4847        $content_width = 640;
    4948
    50 /** Tell WordPress to run twentyten_setup() when the 'after_setup_theme' hook is run. */
     49/* Tell WordPress to run twentyten_setup() when the 'after_setup_theme' hook is run. */
    5150add_action( 'after_setup_theme', 'twentyten_setup' );
    5251
    5352if ( ! function_exists( 'twentyten_setup' ) ):
     
    8483        // Add default posts and comments RSS feed links to head
    8584        add_theme_support( 'automatic-feed-links' );
    8685
    87         /**
    88          * Make theme available for translation.
     86        /* Make theme available for translation.
    8987         * Translations can be filed in the /languages/ directory
    9088         */
    9189        load_theme_textdomain( 'twentyten', get_template_directory() . '/languages' );
     
    104102        // The custom header business starts here.
    105103
    106104        $custom_header_support = array(
    107                 /**
    108                  * The default image to use.
     105                /* The default image to use.
    109106                 * The %s is a placeholder for the theme template directory URI.
    110107                 */
    111108                'default-image' => '%s/images/headers/path.jpg',
     
    147144                add_custom_background();
    148145        }
    149146
    150         /**
    151          * We'll be using post thumbnails for custom header images on posts and pages.
     147        /* We'll be using post thumbnails for custom header images on posts and pages.
    152148         * We want them to be 940 pixels wide by 198 pixels tall.
    153149         * Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
    154150         */
  • src/wp-content/themes/twentyten/header.php

     
    3737<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
    3838<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
    3939<?php
    40         /**
    41          * We add some JavaScript to pages with the comment form
     40        /* We add some JavaScript to pages with the comment form
    4241         * to support sites with threaded comments (when in use).
    4342         */
    4443        if ( is_singular() && get_option( 'thread_comments' ) )
    4544                wp_enqueue_script( 'comment-reply' );
    4645
    47         /**
    48          * Always have wp_head() just before the closing </head>
     46        /* Always have wp_head() just before the closing </head>
    4947         * tag of your theme, or you will break many plugins, which
    5048         * generally use this hook to add elements to <head> such
    5149         * as styles, scripts, and meta tags.
     
    7068                                <?php
    7169                                        // Compatibility with versions of WordPress prior to 3.4.
    7270                                        if ( function_exists( 'get_custom_header' ) ) {
    73                                                 /**
    74                                                  * We need to figure out what the minimum width should be for our featured image.
     71                                                /* We need to figure out what the minimum width should be for our featured image.
    7572                                                 * This result would be the suggested width if the theme were to implement flexible widths.
    7673                                                 */
    7774                                                $header_image_width = get_theme_support( 'custom-header', 'width' );
  • src/wp-content/themes/twentyten/index.php

     
    1919                        <div id="content" role="main">
    2020
    2121                        <?php
    22                         /**
    23                          * Run the loop to output the posts.
     22                        /* Run the loop to output the posts.
    2423                         * If you want to overload this in a child theme then include a file
    2524                         * called loop-index.php and that will be used instead.
    2625                         */
  • src/wp-content/themes/twentyten/loop.php

     
    3939<?php endif; ?>
    4040
    4141<?php
    42         /**
    43          * Start the Loop.
     42        /* Start the Loop.
    4443         *
    4544         * In Twenty Ten we use the same loop in multiple contexts.
    4645         * It is broken into three main parts: when we're displaying
  • src/wp-content/themes/twentyten/onecolumn-page.php

     
    1818                        <div id="content" role="main">
    1919
    2020                        <?php
    21                         /**
    22                          * Run the loop to output the page.
     21                        /* Run the loop to output the page.
    2322                         * If you want to overload this in a child theme then include a file
    2423                         * called loop-page.php and that will be used instead.
    2524                         */
  • src/wp-content/themes/twentyten/page.php

     
    1818                        <div id="content" role="main">
    1919
    2020                        <?php
    21                         /**
    22                          * Run the loop to output the page.
     21                        /* Run the loop to output the page.
    2322                         * If you want to overload this in a child theme then include a file
    2423                         * called loop-page.php and that will be used instead.
    2524                         */
  • src/wp-content/themes/twentyten/search.php

     
    1515<?php if ( have_posts() ) : ?>
    1616                                <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyten' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
    1717                                <?php
    18                                 /**
    19                                  * Run the loop for the search to output the results.
     18                                /* Run the loop for the search to output the results.
    2019                                 * If you want to overload this in a child theme then include a file
    2120                                 * called loop-search.php and that will be used instead.
    2221                                 */
  • src/wp-content/themes/twentyten/sidebar-footer.php

     
    99?>
    1010
    1111<?php
    12         /**
    13          * The footer widget area is triggered if any of the areas
     12        /* The footer widget area is triggered if any of the areas
    1413         * have widgets. So let's check that first.
    1514         *
    1615         * If none of the sidebars have widgets, then let's bail early.
  • src/wp-content/themes/twentyten/sidebar.php

     
    1212                        <ul class="xoxo">
    1313
    1414<?php
    15         /**
    16          * When we call the dynamic_sidebar() function, it'll spit out
     15        /* When we call the dynamic_sidebar() function, it'll spit out
    1716         * the widgets for that widget area. If it instead returns false,
    1817         * then the sidebar simply doesn't exist, so we'll hard-code in
    1918         * some default sidebar stuff just in case.
  • src/wp-content/themes/twentyten/single.php

     
    1313                        <div id="content" role="main">
    1414
    1515                        <?php
    16                         /**
    17                          * Run the loop to output the post.
     16                        /* Run the loop to output the post.
    1817                         * If you want to overload this in a child theme then include a file
    1918                         * called loop-single.php and that will be used instead.
    2019                         */
  • src/wp-content/themes/twentyten/tag.php

     
    1717                                ?></h1>
    1818
    1919<?php
    20 /**
    21  * Run the loop for the tag archive to output the posts
     20/* Run the loop for the tag archive to output the posts
    2221 * If you want to overload this in a child theme then include a file
    2322 * called loop-tag.php and that will be used instead.
    2423 */