WordPress.org

Make WordPress Core

Changeset 36595


Ignore:
Timestamp:
02/20/2016 02:40:33 PM (4 years ago)
Author:
ocean90
Message:

Theme Compat: Replace the custom comment form with comment_form() and reduce number of links.

comment_form() has nearly the same markup as the custom form but also includes the latest enhancements like improved a11y and more filters.

Add translators comments, props ramiy.

Fixes #35888.

Location:
trunk/src/wp-includes/theme-compat
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/theme-compat/comments.php

    r35455 r36595  
    6969<?php endif; ?>
    7070
    71 <?php if ( comments_open() ) : ?>
    72 
    73 <div id="respond">
    74 
    75 <h3><?php comment_form_title( __('Leave a Reply'), __('Leave a Reply to %s' ) ); ?></h3>
    76 
    77 <div id="cancel-comment-reply">
    78     <small><?php cancel_comment_reply_link() ?></small>
    79 </div>
    80 
    81 <?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
    82 <p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.'), wp_login_url( get_permalink() )); ?></p>
    83 <?php else : ?>
    84 
    85 <form action="<?php echo site_url(); ?>/wp-comments-post.php" method="post" id="commentform">
    86 
    87 <?php if ( is_user_logged_in() ) : ?>
    88 
    89 <p><?php /* translators: %s: user profile link  */
    90 printf( __( 'Logged in as %s.' ), sprintf( '<a href="%1$s">%2$s</a>', get_edit_user_link(), $user_identity ) ); ?>
    91 <a href="<?php echo wp_logout_url( get_permalink() ); ?>" title="<?php esc_attr_e( 'Log out of this account' ); ?>"><?php _e( 'Log out &raquo;' ); ?></a></p>
    92 
    93 <?php else : ?>
    94 
    95 <p><input type="text" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
    96 <label for="author"><small><?php _e('Name'); ?> <?php if ($req) _e('(required)'); ?></small></label></p>
    97 
    98 <p><input type="text" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
    99 <label for="email"><small><?php _e('Mail (will not be published)'); ?> <?php if ($req) _e('(required)'); ?></small></label></p>
    100 
    101 <p><input type="text" name="url" id="url" value="<?php echo  esc_attr($comment_author_url); ?>" size="22" tabindex="3" />
    102 <label for="url"><small><?php _e('Website'); ?></small></label></p>
    103 
    104 <?php endif; ?>
    105 
    106 <p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>
    107 
    108 <p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php esc_attr_e('Submit Comment'); ?>" />
    109 <?php comment_id_fields(); ?>
    110 </p>
    111 <?php
    112 /** This filter is documented in wp-includes/comment-template.php */
    113 do_action( 'comment_form', $post->ID );
    114 ?>
    115 
    116 </form>
    117 
    118 <?php endif; // If registration required and not logged in ?>
    119 </div>
    120 
    121 <?php endif; // if you delete this the sky will fall on your head ?>
     71<?php comment_form(); ?>
  • trunk/src/wp-includes/theme-compat/footer.php

    r35456 r36595  
    2222<!-- If you'd like to support WordPress, having the "powered by" link somewhere on your blog is the best way; it's our only promotion or advertising. -->
    2323    <p>
    24         <?php printf(__('%1$s is proudly powered by %2$s'), get_bloginfo('name'),
    25         '<a href="https://wordpress.org/">WordPress</a>'); ?>
    26         <br /><?php printf(__('%1$s and %2$s.'), '<a href="' . get_bloginfo('rss2_url') . '">' . __('Entries (RSS)') . '</a>', '<a href="' . get_bloginfo('comments_rss2_url') . '">' . __('Comments (RSS)') . '</a>'); ?>
    27         <!-- <?php printf(__('%d queries. %s seconds.'), get_num_queries(), timer_stop(0, 3)); ?> -->
     24        <?php
     25        printf(
     26            /* translators: 1: blog name, 2: WordPress */
     27            __( '%1$s is proudly powered by %2$s' ),
     28            get_bloginfo('name'),
     29            '<a href="https://wordpress.org/">WordPress</a>'
     30        );
     31        ?>
    2832    </p>
    2933</div>
  • trunk/src/wp-includes/theme-compat/sidebar.php

    r35458 r36595  
    7272                        sprintf( '<a href="%1$s/">%2$s</a>', get_bloginfo( 'url' ), get_bloginfo( 'name' ) ),
    7373                        esc_html( get_search_query() )
    74                     ); 
     74                    );
    7575                ?></p>
    7676
     
    106106                    <?php wp_register(); ?>
    107107                    <li><?php wp_loginout(); ?></li>
    108                     <li><a href="http://validator.w3.org/check/referer" title="<?php esc_attr_e('This page validates as XHTML 1.0 Transitional'); ?>"><?php _e('Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr>'); ?></a></li>
    109                     <li><a href="http://gmpg.org/xfn/"><abbr title="<?php esc_attr_e('XHTML Friends Network'); ?>"><?php _e('XFN'); ?></abbr></a></li>
    110                     <li><a href="https://wordpress.org/" title="<?php esc_attr_e('Powered by WordPress, state-of-the-art semantic personal publishing platform.'); ?>">WordPress</a></li>
    111108                    <?php wp_meta(); ?>
    112109                </ul>
Note: See TracChangeset for help on using the changeset viewer.