Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Handle more cases (untrailingslashit, HTTPS urls) for sanitizing an author URL for display in the comments list table.

Browse Source 
Props afercia, mehulkaklotar, swissspidy, johnbillion.
Fixes #33291.

Built from https://develop.svn.wordpress.org/trunk@33894


git-svn-id: http://core.svn.wordpress.org/trunk@33863 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-09-03 23:23:24 +00:00
parent 54c2cabf66
commit 80a20e5c3d
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/includes/class-wp-comments-list-table.php
View File

@ -636,19 +636,15 @@ class WP_Comments_List_Table extends WP_List_Table {
global $comment_status; global $comment_status;
$author_url = get_comment_author_url( $comment->comment_ID ); $author_url = get_comment_author_url( $comment->comment_ID );
if ( 'http://' == $author_url ) {
$author_url = '';
}
$author_url_display = preg_replace( '|http://(www\.)?|i', '', $author_url ); $author_url_display = untrailingslashit( preg_replace( '|^http(s)?://(www\.)?|i', '', $author_url ) );
if ( strlen( $author_url_display ) > 50 ) { if ( strlen( $author_url_display ) > 50 ) {
$author_url_display = wp_html_excerpt( $author_url_display, 49, '…' ); $author_url_display = wp_html_excerpt( $author_url_display, 49, '…' );
} }
echo "<strong>"; comment_author( $comment->comment_ID ); echo '</strong><br />'; echo "<strong>"; comment_author( $comment->comment_ID ); echo '</strong><br />';
if ( !empty( $author_url ) ) { if ( ! empty( $author_url_display ) ) {
echo "<a title='$author_url' href='$author_url'>$author_url_display</a><br />"; printf( '<a href="%s">%s</a><br />', esc_url( $author_url ), esc_html( $author_url_display ) );
} }
if ( $this->user_can ) { if ( $this->user_can ) {

2
wp-includes/version.php
View File

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