<!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>[12804] trunk/wp-admin/includes/ms.php: Remove raquo.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12804">12804</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-22 22:34:54 +0000 (Fri, 22 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove raquo. see <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (12803 => 12804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-01-22 22:30:52 UTC (rev 12803)
+++ trunk/wp-admin/includes/ms.php 2010-01-22 22:34:54 UTC (rev 12804)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->users WHERE ID = %d", $id) );
</span><span class="cx"> $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d", $id) );
</span><span class="cx">
</span><del>- clean_user_cache($id);
</del><ins>+ clean_user_cache($id);
</ins><span class="cx">
</span><span class="cx"> // allow for commit transaction
</span><span class="cx"> do_action('deleted_user', $id);
</span><span class="lines">@@ -385,25 +385,27 @@
</span><span class="cx">
</span><span class="cx"> // Display File upload quota on dashboard
</span><span class="cx"> function dashboard_quota() {
</span><del>- if ( get_site_option( 'upload_space_check_disabled' ) ) {
</del><ins>+ if ( get_site_option( 'upload_space_check_disabled' ) )
</ins><span class="cx"> return true;
</span><del>- }
</del><ins>+
</ins><span class="cx"> $quota = get_space_allowed();
</span><span class="cx"> $used = get_dirsize( BLOGUPLOADDIR )/1024/1024;
</span><span class="cx">
</span><del>- if ($used > $quota) $percentused = '100';
- else $percentused = ( $used / $quota ) * 100;
</del><ins>+ if ( $used > $quota )
+ $percentused = '100';
+ else
+ $percentused = ( $used / $quota ) * 100;
</ins><span class="cx"> $percentused = number_format($percentused);
</span><span class="cx"> $used = round($used,2);
</span><span class="cx"> $used_color = ($used < 70) ? (($used >= 40) ? 'waiting' : 'approved') : 'spam';
</span><span class="cx"> ?>
</span><del>- <p class="sub musub"><?php _e("Storage Space <a href='upload.php' title='Manage Uploads...'>&raquo;</a>"); ?></p>
</del><ins>+ <p class="sub musub"><?php _e('Storage Space'); ?></p>
</ins><span class="cx"> <div class="table">
</span><span class="cx"> <table>
</span><span class="cx"> <tr class="first">
</span><del>- <td class="first b b-posts"><?php printf( __( '<a href="upload.php" title="Manage Uploads..." class="musublink">%sMB</a>' ), $quota ); ?></td>
</del><ins>+ <td class="first b b-posts"><?php printf( __( '<a href="upload.php" title="Manage Uploads" class="musublink">%sMB</a>' ), $quota ); ?></td>
</ins><span class="cx"> <td class="t posts"><?php _e('Space Allowed'); ?></td>
</span><del>- <td class="b b-comments"><?php printf( __( '<a href="upload.php" title="Manage Uploads..." class="musublink">%1sMB (%2s%%)</a>' ), $used, $percentused ); ?>
</del><ins>+ <td class="b b-comments"><?php printf( __( '<a href="upload.php" title="Manage Uploads" class="musublink">%1sMB (%2s%%)</a>' ), $used, $percentused ); ?>
</ins><span class="cx"> <td class="last t comments <?php echo $used_color;?>"><?php _e('Space Used');?></td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="lines">@@ -698,11 +700,11 @@
</span><span class="cx"> $item = $rss->get_item();
</span><span class="cx"> if ( !is_null( $item ) ) {
</span><span class="cx"> $title = $item->get_title();
</span><del>- if ( md5( $title ) == get_user_option( 'admin_feed_dismiss', $current_user->id ) )
</del><ins>+ if ( md5( $title ) == get_user_option( 'admin_feed_dismiss', $current_user->id ) )
</ins><span class="cx"> return;
</span><span class="cx"> $msg = "<h3>" . esc_html( $title ) . "</h3>\n";
</span><span class="cx"> $content = $item->get_description();
</span><del>- if ( is_null( $content ) )
</del><ins>+ if ( is_null( $content ) )
</ins><span class="cx"> $content = __( 'something' );
</span><span class="cx">
</span><span class="cx"> $content = wp_html_excerpt($content, 200) . ' ...';
</span></span></pre>
</div>
</div>
</body>
</html>