Allow site admin to change upload space settings and file types

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@155 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 2 insertions, 1 deletions

diff --git a/wp-inst/wp-admin/upload.php b/wp-inst/wp-admin/upload.php
index ae305ee..d1f02ec 100644
--- a/wp-inst/wp-admin/upload.php
+++ b/wp-inst/wp-admin/upload.php
@@ -11,7 +11,8 @@ if (!get_settings('use_fileupload')) //Checks if file upload is enabled in the c
 if ( ! current_user_can('upload_files') )
 	die (__("You are not allowed to upload files"));
 
-$allowed_types = explode(' ', "jpg jpeg png gif");
+$allowed_types = get_site_option( 'upload_filetypes' ) == false ? 'jpg jpeg png gif' : get_site_option( 'upload_filetypes' );
+$allowed_types = explode(' ', $allowed_types );
 
 if ($_POST['submit']) {
 	$action = 'upload';