
<!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>[13835] trunk/wp-admin/includes/ms.php:

  Use correct var in MS dashboard_quota().</title>

</head>

<body>


<div id="msg">

<dl>

<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13835">13835</a></dd>

<dt>Author</dt> <dd>nacin</dd>

<dt>Date</dt> <dd>2010-03-26 21:50:54 +0000 (Fri, 26 Mar 2010)</dd>

</dl>


<h3>Log Message</h3>

<pre>Use correct var in MS dashboard_quota(). props ocean90, see <a href="http://trac.wordpress.org/ticket/12710">#12710</a>. also fixes sprintf string.</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 (13834 => 13835)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/includes/ms.php        2010-03-26 21:07:12 UTC (rev 13834)

+++ trunk/wp-admin/includes/ms.php        2010-03-26 21:50:54 UTC (rev 13835)

</span><span class="lines">@@ -448,9 +448,10 @@

</span><span class="cx">                 $percentused = '100';

</span><span class="cx">         else

</span><span class="cx">                 $percentused = ( $used / $quota ) * 100;

</span><del>-        $percentused = number_format($percentused);

-        $used = round($used,2);

-        $used_color = ($used &lt; 70) ? (($used &gt;= 40) ? 'waiting' : 'approved') : 'spam';

</del><ins>+        $used_color = ( $percentused &lt; 70 ) ? ( ( $percentused &gt;= 40 ) ? 'waiting' : 'approved') : 'spam';

+        $used = round( $used, 2 );

+        $percentused = number_format( $percentused );

+

</ins><span class="cx">         ?&gt;

</span><span class="cx">         &lt;p class=&quot;sub musub&quot;&gt;&lt;?php _e('Storage Space'); ?&gt;&lt;/p&gt;

</span><span class="cx">         &lt;div class=&quot;table&quot;&gt;

</span><span class="lines">@@ -458,7 +459,7 @@

</span><span class="cx">                 &lt;tr class=&quot;first&quot;&gt;

</span><span class="cx">                         &lt;td class=&quot;first b b-posts&quot;&gt;&lt;?php printf( __( '&lt;a href=&quot;upload.php&quot; title=&quot;Manage Uploads&quot; class=&quot;musublink&quot;&gt;%sMB&lt;/a&gt;' ), $quota ); ?&gt;&lt;/td&gt;

</span><span class="cx">                         &lt;td class=&quot;t posts&quot;&gt;&lt;?php _e('Space Allowed'); ?&gt;&lt;/td&gt;

</span><del>-                        &lt;td class=&quot;b b-comments&quot;&gt;&lt;?php printf( __( '&lt;a href=&quot;upload.php&quot; title=&quot;Manage Uploads&quot; class=&quot;musublink&quot;&gt;%1sMB (%2s%%)&lt;/a&gt;' ), $used, $percentused ); ?&gt;&lt;/td&gt;

</del><ins>+                        &lt;td class=&quot;b b-comments&quot;&gt;&lt;?php printf( __( '&lt;a href=&quot;upload.php&quot; title=&quot;Manage Uploads&quot; class=&quot;musublink&quot;&gt;%1sMB (%2$s%%)&lt;/a&gt;' ), $used, $percentused ); ?&gt;&lt;/td&gt;

</ins><span class="cx">                         &lt;td class=&quot;last t comments &lt;?php echo $used_color;?&gt;&quot;&gt;&lt;?php _e('Space Used');?&gt;&lt;/td&gt;

</span><span class="cx">                 &lt;/tr&gt;

</span><span class="cx">         &lt;/table&gt;

</span></span></pre>

</div>

</div>


</body>

</html>