<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16536] trunk/wp-admin/includes: Document url_shorten()
and use in more places.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16536">16536</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-22 17:17:31 +0000 (Mon, 22 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Document url_shorten() and use in more places. Props latz for initial patch. Fixes <a href="http://trac.wordpress.org/ticket/15540">#15540</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswplinkslisttablephp">trunk/wp-admin/includes/class-wp-links-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpuserslisttablephp">trunk/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunkwpadminincludesmiscphp">trunk/wp-admin/includes/misc.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswplinkslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-links-list-table.php (16535 => 16536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-links-list-table.php 2010-11-22 17:17:26 UTC (rev 16535)
+++ trunk/wp-admin/includes/class-wp-links-list-table.php 2010-11-22 17:17:31 UTC (rev 16536)
</span><span class="lines">@@ -105,12 +105,7 @@
</span><span class="cx"> $link->link_name = esc_attr( $link->link_name );
</span><span class="cx"> $link->link_category = wp_get_link_cats( $link->link_id );
</span><span class="cx">
</span><del>- $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 ).'...';
</del><ins>+ $short_url = url_shorten( $link->link_url );
</ins><span class="cx">
</span><span class="cx"> $visible = ( $link->link_visible == 'Y' ) ? __( 'Yes' ) : __( 'No' );
</span><span class="cx"> $rating = $link->link_rating;
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-users-list-table.php (16535 => 16536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-users-list-table.php 2010-11-22 17:17:26 UTC (rev 16535)
+++ trunk/wp-admin/includes/class-wp-users-list-table.php 2010-11-22 17:17:31 UTC (rev 16536)
</span><span class="lines">@@ -171,13 +171,7 @@
</span><span class="cx"> $user_object = new WP_User( (int) $user_object );
</span><span class="cx"> $user_object = sanitize_user_object( $user_object, 'display' );
</span><span class="cx"> $email = $user_object->user_email;
</span><del>- $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 ).'...';
</del><ins>+
</ins><span class="cx"> $checkbox = '';
</span><span class="cx"> // Check if the user for this row is editable
</span><span class="cx"> if ( current_user_can( 'list_users' ) ) {
</span></span></pre></div>
<a id="trunkwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/misc.php (16535 => 16536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/misc.php 2010-11-22 17:17:26 UTC (rev 16535)
+++ trunk/wp-admin/includes/misc.php 2010-11-22 17:17:31 UTC (rev 16536)
</span><span class="lines">@@ -212,12 +212,12 @@
</span><span class="cx"> add_action( 'update_option_siteurl', 'update_home_siteurl', 10, 2 );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * {@internal Missing Short Description}}
</del><ins>+ * Shorten an URL, to be used as link text
</ins><span class="cx"> *
</span><del>- * @since unknown
</del><ins>+ * @since 1.2.1
</ins><span class="cx"> *
</span><del>- * @param unknown_type $url
- * @return unknown
</del><ins>+ * @param string $url
+ * @return string
</ins><span class="cx"> */
</span><span class="cx"> function url_shorten( $url ) {
</span><span class="cx"> $short_url = str_replace( 'http://', '', stripslashes( $url ));
</span></span></pre>
</div>
</div>
</body>
</html>