Index: trunk/src/wp-admin/includes/ms.php =================================================================== --- trunk/src/wp-admin/includes/ms.php (revision 34778) +++ trunk/src/wp-admin/includes/ms.php (revision 34912) @@ -17,5 +17,5 @@ */ function check_upload_size( $file ) { - if ( get_network_option( 'upload_space_check_disabled' ) ) + if ( get_site_option( 'upload_space_check_disabled' ) ) return $file; @@ -31,6 +31,6 @@ if ( $space_left < $file_size ) $file['error'] = sprintf( __( 'Not enough space to upload. %1$s KB needed.' ), number_format( ($file_size - $space_left) /1024 ) ); - if ( $file_size > ( 1024 * get_network_option( 'fileupload_maxk', 1500 ) ) ) - $file['error'] = sprintf(__('This file is too big. Files must be less than %1$s KB in size.'), get_network_option( 'fileupload_maxk', 1500 ) ); + if ( $file_size > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) ) + $file['error'] = sprintf(__('This file is too big. Files must be less than %1$s KB in size.'), get_site_option( 'fileupload_maxk', 1500 ) ); if ( upload_is_user_over_quota( false ) ) { $file['error'] = __( 'You have used your space quota. Please delete files before uploading.' ); @@ -99,5 +99,5 @@ // If ms_files_rewriting is enabled and upload_path is empty, wp_upload_dir is not reliable. - if ( $drop && get_network_option( 'ms_files_rewriting' ) && empty( $upload_path ) ) { + if ( $drop && get_site_option( 'ms_files_rewriting' ) && empty( $upload_path ) ) { $drop = false; } @@ -307,5 +307,5 @@ $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'options.php?adminhash='.$hash ) ), $content ); $content = str_replace( '###EMAIL###', $value, $content ); - $content = str_replace( '###SITENAME###', get_network_option( 'site_name' ), $content ); + $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content ); $content = str_replace( '###SITEURL###', network_home_url(), $content ); @@ -386,5 +386,5 @@ $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'profile.php?newuseremail='.$hash ) ), $content ); $content = str_replace( '###EMAIL###', $_POST['email'], $content); - $content = str_replace( '###SITENAME###', get_network_option( 'site_name' ), $content ); + $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content ); $content = str_replace( '###SITEURL###', network_home_url(), $content ); @@ -414,5 +414,5 @@ */ function upload_is_user_over_quota( $echo = true ) { - if ( get_network_option( 'upload_space_check_disabled' ) ) + if ( get_site_option( 'upload_space_check_disabled' ) ) return false; @@ -747,5 +747,5 @@ if ( !is_super_admin() ) return false; - if ( get_network_option( 'wpmu_upgrade_site' ) != $wp_db_version ) + if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) echo "