From e68063f9f36fde18538c3bb6c013c6e0dda05571 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 20 Dec 2010 16:44:33 +0000
Subject: [PATCH] Don't check the upload space site option if the option is
 disabled. props greuben, fixes #13601.

git-svn-id: http://svn.automattic.com/wordpress/trunk@17085 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/ms.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index ae7e75dd93..b7f1c7367b 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -347,6 +347,9 @@ function is_upload_space_available() {
  */
 function upload_size_limit_filter( $size ) {
 	$fileupload_maxk = 1024 * get_site_option( 'fileupload_maxk', 1500 );
+	if ( get_site_option( 'upload_space_check_disabled' ) )
+		return min( $size, $fileupload_maxk );
+		
 	return min( $size, $fileupload_maxk, get_upload_space_available() );
 }
 /**