Changeset 16536

Timestamp:

11/22/2010 05:17:31 PM (14 years ago)

Author:

scribu

Message:

Document url_shorten() and use in more places. Props latz for initial patch. Fixes #15540

Location:

trunk/wp-admin/includes

Files:

• class-wp-links-list-table.php (modified) (1 diff)
• class-wp-users-list-table.php (modified) (1 diff)
• misc.php (modified) (1 diff)

trunk/wp-admin/includes/class-wp-links-list-table.php

@@ -106 +106 @@
             $link->link_category = wp_get_link_cats( $link->link_id );
 
-            $short_url = str_replace( 'http://', '', $link->link_url );
-            $short_url = preg_replace( '/^www\./i', '', $short_url );
-            if ( '/' == substr( $short_url, -1 ) )
-                $short_url = substr( $short_url, 0, -1 );
-            if ( strlen( $short_url ) > 35 )
-                $short_url = substr( $short_url, 0, 32 ).'...';
+            $short_url = url_shorten( $link->link_url );
 
             $visible = ( $link->link_visible == 'Y' ) ? __( 'Yes' ) : __( 'No' );

trunk/wp-admin/includes/class-wp-users-list-table.php

@@ -172 +172 @@
         $user_object = sanitize_user_object( $user_object, 'display' );
         $email = $user_object->user_email;
-        $url = $user_object->user_url;
-        $short_url = str_replace( 'http://', '', $url );
-        $short_url = str_replace( 'www.', '', $short_url );
-        if ( '/' == substr( $short_url, -1 ) )
-            $short_url = substr( $short_url, 0, -1 );
-        if ( strlen( $short_url ) > 35 )
-            $short_url = substr( $short_url, 0, 32 ).'...';
+
         $checkbox = '';
         // Check if the user for this row is editable

trunk/wp-admin/includes/misc.php

@@ -213 +213 @@
 
 /**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $url
- * @return unknown
+ * Shorten an URL, to be used as link text
+ *
+ * @since 1.2.1
+ *
+ * @param string $url
+ * @return string
  */
 function url_shorten( $url ) {