Ticket #21181: 21181.2.patch
File 21181.2.patch, 2.3 KB (added by , 13 years ago) |
---|
-
wp-includes/ms-functions.php
1475 1475 if ( empty( $spaceAllowed ) || !is_numeric( $spaceAllowed ) ) 1476 1476 $spaceAllowed = 10; // Default space allowed is 10 MB 1477 1477 1478 $size = get_dirsize( BLOGUPLOADDIR ) / 1024 / 1024; 1478 $size = apply_filters( 'blog_space_used', false ); 1479 if ( false === $size ) 1480 $size = get_dirsize( BLOGUPLOADDIR ); 1479 1481 1482 $size = $size / 1024 / 1024; 1483 1480 1484 if ( ($spaceAllowed-$size) < 0 ) { 1481 1485 if ( $echo ) 1482 1486 _e( 'Sorry, you have used your space allocation. Please delete some files to upload more files.' ); // No space left … … 1556 1560 return 0; 1557 1561 1558 1562 $spaceAllowed = 1024 * 1024 * get_space_allowed(); 1559 $dirsize = get_dirsize( BLOGUPLOADDIR ); 1563 $dirsize = apply_filters( 'blog_space_used', false ); 1564 if ( false === $dirsize ) 1565 $dirsize = get_dirsize( BLOGUPLOADDIR ); 1566 1560 1567 if ( $size > $spaceAllowed - $dirsize ) 1561 1568 return $spaceAllowed - $dirsize; // remaining space 1562 1569 else -
wp-admin/includes/ms.php
26 26 return $file; 27 27 28 28 $space_allowed = 1048576 * get_space_allowed(); 29 $space_used = get_dirsize( BLOGUPLOADDIR ); 29 $space_used = apply_filters( 'blog_space_used', false ); 30 if ( false === $space_used ) 31 $space_used = get_dirsize( BLOGUPLOADDIR ); 30 32 $space_left = $space_allowed - $space_used; 31 33 $file_size = filesize( $file['tmp_name'] ); 32 34 if ( $space_left < $file_size ) … … 310 312 if ( get_site_option( 'upload_space_check_disabled' ) ) 311 313 return $space_allowed; 312 314 315 $space_available = apply_filters( 'pre_get_upload_space_available', false ); 316 if ( false !== $space_available ) 317 return $space_available; 318 313 319 $dir_name = trailingslashit( BLOGUPLOADDIR ); 314 320 if ( !( is_dir( $dir_name) && is_readable( $dir_name ) ) ) 315 321 return $space_allowed; … … 353 359 354 360 function display_space_usage() { 355 361 $space = get_space_allowed(); 356 $used = get_dirsize( BLOGUPLOADDIR ) / 1024 / 1024; 362 $used = apply_filters( 'blog_space_used', false ); 363 if ( false === $used ) 364 $used = get_dirsize( BLOGUPLOADDIR ) / 1024 / 1024; 357 365 358 366 $percentused = ( $used / $space ) * 100; 359 367