Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 06:42:56 +02:00
Code Issues Projects Releases Wiki Activity

Docs: After [35314], fix the DocBlock for url_shorten().

Browse Source 
Merge of [35813] for the 4.4 branch.

Props swissspidy.
See #20166.
Built from https://develop.svn.wordpress.org/branches/4.4@35815


git-svn-id: http://core.svn.wordpress.org/branches/4.4@35779 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2015-12-07 17:06:25 +00:00
parent 69aeed3bdc
commit 2a9083b97e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/formatting.php
View File

@ -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 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 string $url URL to shorten.
* @param int $length Maxiumum length of url to return * @param int $length Optional. Maximum length of the shortened URL. Default 35 characters.
* @return string * @return string Shortened URL.
*/ */
function url_shorten( $url, $length = 35 ) { function url_shorten( $url, $length = 35 ) {
$stripped = str_replace( array( 'https://', 'http://', 'www.' ), '', $url ); $stripped = str_replace( array( 'https://', 'http://', 'www.' ), '', $url );
$short_url = untrailingslashit( $stripped ); $short_url = untrailingslashit( $stripped );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.