From 3d44d70aab673d00659be4aedfb93a6ee8708a9f Mon Sep 17 00:00:00 2001
From: wpmuguru <wpmuguru@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 16 May 2010 20:09:56 +0000
Subject: [PATCH] observe fileupload_maxk in media uploader, see #12853

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

diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index cb5c10be43..f5f6e5a3d4 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -408,9 +408,12 @@ function is_upload_space_available() {
 
 /*
  * @since 3.0.0
+ *
+ * @return int of upload size limit in bytes
  */
 function upload_size_limit_filter( $size ) {
-	return min( $size, get_upload_space_available() );
+	$fileupload_maxk = 1024 * get_site_option( 'fileupload_maxk', 1500 );
+	return min( $size, $fileupload_maxk, get_upload_space_available() );
 }
 /**
  * Determines if there is any upload space left in the current blog's quota.