X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/5aa86a9053fb0fa15846bb60aac2fb8fdfff524a..a6f44f0edcda2471c5a33e4156c1c9488c7f3210:/wp-includes/comment-template.php diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php index 25f73c3d..afbee05f 100644 --- a/wp-includes/comment-template.php +++ b/wp-includes/comment-template.php @@ -55,7 +55,7 @@ function comment_author( $comment_ID = 0 ) { * @uses apply_filters() Calls the 'get_comment_author_email' hook on the comment author email * @uses $comment * - * @param int $comment_ID The ID of the comment for which to get the author's email. Optional. + * @param int $comment_ID The ID of the comment for which to get the author's email. Optional. * @return string The current comment author's email */ function get_comment_author_email( $comment_ID = 0 ) { @@ -141,7 +141,7 @@ function get_comment_author_email_link($linktext='', $before='', $after='') { * @since 1.5.0 * @uses apply_filters() Calls 'get_comment_author_link' hook on the complete link HTML or author * - * @param int $comment_ID The ID of the comment for which to get the author's link. Optional. + * @param int $comment_ID The ID of the comment for which to get the author's link. Optional. * @return string Comment Author name or HTML link for author's URL */ function get_comment_author_link( $comment_ID = 0 ) { @@ -189,7 +189,7 @@ function get_comment_author_IP( $comment_ID = 0 ) { * @since 0.71 * @see get_comment_author_IP() Echoes Result * - * @param int $comment_ID The ID of the comment for which to print the author's IP address. Optional. + * @param int $comment_ID The ID of the comment for which to print the author's IP address. Optional. */ function comment_author_IP( $comment_ID = 0 ) { echo get_comment_author_IP( $comment_ID ); @@ -201,7 +201,7 @@ function comment_author_IP( $comment_ID = 0 ) { * @since 1.5.0 * @uses apply_filters() Calls 'get_comment_author_url' hook on the comment author's URL * - * @param int $comment_ID The ID of the comment for which to get the author's URL. Optional. + * @param int $comment_ID The ID of the comment for which to get the author's URL. Optional. * @return string */ function get_comment_author_url( $comment_ID = 0 ) { @@ -384,7 +384,7 @@ function get_comment_date( $d = '', $comment_ID = 0 ) { * @since 0.71 * * @param string $d The format of the date (defaults to user's config) - * @param int $comment_ID The ID of the comment for which to print the date. Optional. + * @param int $comment_ID The ID of the comment for which to print the date. Optional. */ function comment_date( $d = '', $comment_ID = 0 ) { echo get_comment_date( $d, $comment_ID ); @@ -393,8 +393,8 @@ function comment_date( $d = '', $comment_ID = 0 ) { /** * Retrieve the excerpt of the current comment. * - * Will cut each word and only output the first 20 words with '...' at the end. - * If the word count is less than 20, then no truncating is done and no '...' + * Will cut each word and only output the first 20 words with '…' at the end. + * If the word count is less than 20, then no truncating is done and no '…' * will appear. * * @since 1.5.0 @@ -419,7 +419,7 @@ function get_comment_excerpt( $comment_ID = 0 ) { for ($i=0; $i<$k; $i++) { $excerpt .= $blah[$i] . ' '; } - $excerpt .= ($use_dotdotdot) ? '...' : ''; + $excerpt .= ($use_dotdotdot) ? '…' : ''; return apply_filters('get_comment_excerpt', $excerpt); } @@ -516,7 +516,7 @@ function get_comment_link( $comment = null, $args = array() ) { * @return string The link to the comments */ function get_comments_link($post_id = 0) { - return get_permalink($post_id) . '#comments'; + return apply_filters( 'get_comments_link', get_permalink( $post_id ) . '#comments', $post_id ); } /** @@ -532,7 +532,7 @@ function comments_link( $deprecated = '', $deprecated_2 = '' ) { _deprecated_argument( __FUNCTION__, '0.72' ); if ( !empty( $deprecated_2 ) ) _deprecated_argument( __FUNCTION__, '1.3' ); - echo get_comments_link(); + echo esc_url( get_comments_link() ); } /** @@ -769,7 +769,7 @@ function trackback_rdf( $deprecated = '' ) { * @param int $post_id An optional post ID to check instead of the current post. * @return bool True if the comments are open */ -function comments_open( $post_id=NULL ) { +function comments_open( $post_id = null ) { $_post = get_post($post_id); @@ -786,7 +786,7 @@ function comments_open( $post_id=NULL ) { * @param int $post_id An optional post ID to check instead of the current post. * @return bool True if pings are accepted */ -function pings_open( $post_id = NULL ) { +function pings_open( $post_id = null ) { $_post = get_post($post_id); @@ -810,14 +810,13 @@ function pings_open( $post_id = NULL ) { * @uses $post Gets the ID of the current post for the token */ function wp_comment_form_unfiltered_html_nonce() { - global $post; + $post = get_post(); + $post_id = $post ? $post->ID : 0; - $post_id = 0; - if ( !empty($post) ) - $post_id = $post->ID; - - if ( current_user_can('unfiltered_html') ) - wp_nonce_field('unfiltered-html-comment_' . $post_id, '_wp_unfiltered_html_comment', false); + if ( current_user_can( 'unfiltered_html' ) ) { + wp_nonce_field( 'unfiltered-html-comment_' . $post_id, '_wp_unfiltered_html_comment_disabled', false ); + echo "\n"; + } } /** @@ -895,24 +894,24 @@ function comments_template( $file = '/comments.php', $separate_comments = false update_comment_cache($wp_query->comments); if ( $separate_comments ) { - $wp_query->comments_by_type = &separate_comments($comments); + $wp_query->comments_by_type = separate_comments($comments); $comments_by_type = &$wp_query->comments_by_type; } - $overridden_cpage = FALSE; + $overridden_cpage = false; if ( '' == get_query_var('cpage') && get_option('page_comments') ) { set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 ); - $overridden_cpage = TRUE; + $overridden_cpage = true; } - if ( !defined('COMMENTS_TEMPLATE') || !COMMENTS_TEMPLATE) + if ( !defined('COMMENTS_TEMPLATE') ) define('COMMENTS_TEMPLATE', true); $include = apply_filters('comments_template', STYLESHEETPATH . $file ); if ( file_exists( $include ) ) require( $include ); elseif ( file_exists( TEMPLATEPATH . $file ) ) - require( TEMPLATEPATH . $file ); + require( TEMPLATEPATH . $file ); else // Backward compat code will be removed in a future release require( ABSPATH . WPINC . '/theme-compat/comments.php'); } @@ -1091,7 +1090,7 @@ function comment_reply_link($args = array(), $comment = null, $post = null) { * @since 2.7.0 * * @param array $args Optional. Override default options. - * @param int|object $post Optional. Post that the comment is going to be displayed on. Defaults to current post. + * @param int|object $post Optional. Post that the comment is going to be displayed on. Defaults to current post. * @return string|bool|null Link to show comment form, if successful. False, if comments are closed. */ function get_post_reply_link($args = array(), $post = null) { @@ -1191,7 +1190,7 @@ function comment_id_fields( $id = 0 ) { * @param string $replytext Optional. Text to display when replying to a comment. Accepts "%s" for the author of the comment being replied to. * @param string $linktoparent Optional. Boolean to control making the author's name a link to their comment. */ -function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = TRUE ) { +function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) { global $comment; if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' ); @@ -1238,18 +1237,18 @@ class Walker_Comment extends Walker { * @param int $depth Depth of comment. * @param array $args Uses 'style' argument for type of HTML list. */ - function start_lvl(&$output, $depth, $args) { + function start_lvl( &$output, $depth = 0, $args = array() ) { $GLOBALS['comment_depth'] = $depth + 1; switch ( $args['style'] ) { case 'div': break; case 'ol': - echo "
' . ( $req ? '*' : '' ) . - '
', - 'url' => '' . - '
', + 'email' => '' . + '
', + 'url' => '' . + '
', ); $required_text = sprintf( ' ' . __('Required fields are marked %s'), '*' ); $defaults = array( 'fields' => apply_filters( 'comment_form_default_fields', $fields ), - 'comment_field' => '', - 'must_log_in' => '' . sprintf( __( 'You must be logged in to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '
', - 'logged_in_as' => '' . sprintf( __( 'Logged in as %2$s. Log out?' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '
', + 'comment_field' => '', + 'must_log_in' => '
' . sprintf( __( 'You must be logged in to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '
', + 'logged_in_as' => '' . sprintf( __( 'Logged in as %2$s. Log out?' ), get_edit_user_link(), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '
', 'comment_notes_before' => '' . __( 'Your email address will not be published.' ) . ( $req ? $required_text : '' ) . '
', 'comment_notes_after' => ' ', 'id_form' => 'commentform', @@ -1544,20 +1636,21 @@ function comment_form( $args = array(), $post_id = null ) { 'title_reply_to' => __( 'Leave a Reply to %s' ), 'cancel_reply_link' => __( 'Cancel reply' ), 'label_submit' => __( 'Post Comment' ), + 'format' => 'xhtml', ); $args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) ); ?> - + -