summaryrefslogtreecommitdiffstats
path: root/wp-admin/includes
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-10-17 17:00:35 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-10-17 17:00:35 +0000
commitb414235e0076d3325c4e7cb916f2a210f5389e9f (patch)
tree0cb8608df47a042b09483cb44fe1a3c56183cbd2 /wp-admin/includes
parenta6270a97f3cd99c7fb8992d20663f544d40dec5a (diff)
downloadwordpress-mu-b414235e0076d3325c4e7cb916f2a210f5389e9f.tar.gz
wordpress-mu-b414235e0076d3325c4e7cb916f2a210f5389e9f.tar.xz
wordpress-mu-b414235e0076d3325c4e7cb916f2a210f5389e9f.zip
If quota is lowered then make percentage used 100%
No more falsevalue in quota check Reword xmlrpc default action git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1091 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/includes')
-rw-r--r--wp-admin/includes/mu.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/wp-admin/includes/mu.php b/wp-admin/includes/mu.php
index 285840c..0a7e145 100644
--- a/wp-admin/includes/mu.php
+++ b/wp-admin/includes/mu.php
@@ -254,6 +254,8 @@ function dashboard_quota() {
$size = round($size, 2);
$pct = round(($size / $quota)*100);
+ if ($size > $quota)
+ $pct = '100';
$out .= "<strong>{$size}MB ({$pct}%)</strong>";
$out .= "</p>";
$out .= "</div>";
@@ -267,11 +269,11 @@ add_action('activity_box_end', 'dashboard_quota');
function upload_space_setting( $id ) {
$quota = get_blog_option($id, "blog_upload_space");
- if($quota == "falsevalue") $quota = "";
+ if( !$quota ) $quota = "";
$out = "<strong>Blog Upload Space Quota</strong>\n";
$out .= '<input type="text" size="3" name="option[blog_upload_space]" value="';
$out .= $quota;
- $out .= '" /> MB<br />'."\n";
+ $out .= '" />MB (Leave blank for site default)<br />'."\n";
echo $out;
}
add_filter('wpmueditblogaction', 'upload_space_setting');
@@ -287,7 +289,7 @@ function xmlrpc_active_setting( $id ) {
?><p><strong>XMLRPC Posting is disabled sitewide.</strong></p><?php
}
?>
- <input type='radio' name='option[xmlrpc_active]' value='' <?php if( !$xmlrpc_active || $xmlrpc_active == '' ) echo "checked"; ?>> Obey sitewide default<br />
+ <input type='radio' name='option[xmlrpc_active]' value='' <?php if( !$xmlrpc_active || $xmlrpc_active == '' ) echo "checked"; ?>> Do nothing, accept sitewide default<br />
<input type='radio' name='option[xmlrpc_active]' value='yes' <?php if( $xmlrpc_active == "yes" ) echo "checked"; ?>> XMLRPC always on for this blog<br />
<input type='radio' name='option[xmlrpc_active]' value='no' <?php if( $xmlrpc_active == "no" ) echo "checked"; ?>> XMLRPC always off for this blog<br /><?php
}