WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Comments: Fix undefined `$comment_url` variable notice, introduced in [31641]. 

see #23988.
Built from https://develop.svn.wordpress.org/trunk@31695


git-svn-id: http://core.svn.wordpress.org/trunk@31676 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2015-03-10 14:51:26 +00:00
parent 19f1d4f402
commit 70b7369935
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/comment.php
View File

@ -149,8 +149,9 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
$message = __('This comment is currently in the Trash.');
break;
}
if ( $message )
echo '<div class="updated"><p>' . $message . '</p></div>';
if ( $message ) {
echo '<div class="notice notice-info"><p>' . $message . '</p></div>';
}
}
?>
<p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p>
@ -186,7 +187,6 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
echo $post_link;
if ( $comment->comment_parent ) {
$comment_url = esc_url( get_comment_link( $comment->comment_ID ) );
$parent = get_comment( $comment->comment_parent );
$parent_link = esc_url( get_comment_link( $comment->comment_parent ) );
$name = get_comment_author( $parent->comment_ID );
@ -200,7 +200,8 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
<td>
<?php
/* translators: 2: comment date, 3: comment time */
printf( __( '<a href="%1$s">%2$s at %3$s</a>' ), $comment_url,
printf( __( '<a href="%1$s">%2$s at %3$s</a>' ),
esc_url( get_comment_link( $comment->comment_ID ) ),
/* translators: comment date format. See http://php.net/date */
get_comment_date( __( 'Y/m/d' ) ),
get_comment_date( get_option( 'time_format' ) )

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-alpha-31694';
$wp_version = '4.2-alpha-31695';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.