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

Assume that url_shorten() receives unslashed data, as it does in core usage. see #21767. 

git-svn-id: http://core.svn.wordpress.org/trunk@23575 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-03-01 17:56:31 +00:00
parent 6c82b54070
commit 4e06d41b9f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/includes/misc.php
View File

@ -220,8 +220,7 @@ add_action( 'update_option_page_on_front', 'update_home_siteurl', 10, 2 );
* @return string * @return string
*/ */
function url_shorten( $url ) { function url_shorten( $url ) {
$short_url = str_replace( 'http://', '', wp_unslash( $url )); $short_url = str_replace( array( 'http://', 'www.' ), '', $short_url );
$short_url = str_replace( 'www.', '', $short_url );
$short_url = untrailingslashit( $short_url ); $short_url = untrailingslashit( $short_url );
if ( strlen( $short_url ) > 35 ) if ( strlen( $short_url ) > 35 )
$short_url = substr( $short_url, 0, 32 ) . '...'; $short_url = substr( $short_url, 0, 32 ) . '...';