diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index 5261acb75e..ff4167d227 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -4774,15 +4774,15 @@ function wp_staticize_emoji_for_email( $mail ) { } /** - * Shorten an URL, to be used as link text + * Shorten an URL, to be used as link text. * * @since 1.2.0 - * @since 4.4.0 Moved to wp-includes/formatting.php from wp-admin/includes/misc.php and added $length param + * @since 4.4.0 Moved to wp-includes/formatting.php from wp-admin/includes/misc.php and added $length param. * - * @param string $url URL to shorten - * @param int $length Maxiumum length of url to return - * @return string -*/ + * @param string $url URL to shorten. + * @param int $length Optional. Maximum length of the shortened URL. Default 35 characters. + * @return string Shortened URL. + */ function url_shorten( $url, $length = 35 ) { $stripped = str_replace( array( 'https://', 'http://', 'www.' ), '', $url ); $short_url = untrailingslashit( $stripped ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 4f04c21341..27d3d3e9fd 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-RC1-35814'; +$wp_version = '4.4-RC1-35815'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.