Changeset 35314

Timestamp:

10/21/2015 03:47:23 AM (10 years ago)

Author:

wonderboymusic

Message:

Formatting: move url_shorten() from wp-admin/includes/misc.php to wp-includes/formatting.php for more global access.

Adds unit tests.

Props mulvane, chriscct7.
Fixes #20166.

Location:

trunk

Files:

• src/wp-admin/includes/misc.php (modified) (1 diff)
• src/wp-includes/formatting.php (modified) (1 diff)
• tests/phpunit/tests/formatting/URLShorten.php (added)

trunk/src/wp-admin/includes/misc.php

@@ -289 +289 @@
 }
 
-/**
- * Shorten an URL, to be used as link text
- *
- * @since 1.2.0
- *
- * @param string $url
- * @return string
- */
-function url_shorten( $url ) {
-    $short_url = str_replace( array( 'http://', 'www.' ), '', $url );
-    $short_url = untrailingslashit( $short_url );
-    if ( strlen( $short_url ) > 35 )
-        $short_url = substr( $short_url, 0, 32 ) . '…';
-    return $short_url;
-}
 
 /**

trunk/src/wp-includes/formatting.php

@@ -4770 +4770 @@
     return $mail;
 }
+
+/**
+ * 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
+ *
+ * @param string $url URL to shorten
+ * @param  int $length Maxiumum length of url to return
+ * @return string
+*/
+function url_shorten( $url, $length = 35 ) {
+    $stripped = str_replace( array( 'https://', 'http://', 'www.' ), '', $url );
+    $short_url = untrailingslashit( $stripped );
+
+    if ( strlen( $short_url ) > $length ) {
+        $short_url = substr( $short_url, 0, $length - 3 ) . '…';
+    }
+    return $short_url;
+}