Changeset 18484 for trunk/wp-admin/includes/media.php
- Timestamp:
- 07/29/2011 07:21:21 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/includes/media.php
r18483 r18484 1439 1439 1440 1440 $upload_action_url = admin_url('async-upload.php'); 1441 1442 1441 $post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0; 1443 1442 1444 $upload_size_unit = $max_upload_size = 1443 $upload_size_unit = $max_upload_size = wp_max_upload_size(); 1445 1444 $sizes = array( 'KB', 'MB', 'GB' ); 1446 for ( $u = -1; $upload_size_unit > 1024 && $u < count( $sizes ) - 1; $u++ ) 1445 1446 for ( $u = -1; $upload_size_unit > 1024 && $u < count( $sizes ) - 1; $u++ ) { 1447 1447 $upload_size_unit /= 1024; 1448 } 1449 1448 1450 if ( $u < 0 ) { 1449 1451 $upload_size_unit = 0; … … 1454 1456 ?> 1455 1457 </script> 1458 1456 1459 <div id="media-upload-notice"> 1457 1460 <?php if (isset($errors['upload_notice']) ) { ?> … … 1459 1462 <?php } ?> 1460 1463 </div> 1464 1461 1465 <div id="media-upload-error"> 1462 1466 <?php if (isset($errors['upload_error']) && is_wp_error($errors['upload_error'])) { ?> … … 1484 1488 "short" => "1", 1485 1489 ); 1490 1486 1491 $post_params = apply_filters( 'upload_post_params', $post_params ); // hook change! old name: 'swfupload_post_params' 1487 1492 $p = array(); 1488 foreach ( $post_params as $param => $val ) 1493 1494 foreach ( $post_params as $param => $val ) { 1495 $val = esc_js( $val ); 1489 1496 $p[] = "\t\t'$param' : '$val'"; 1497 } 1498 1490 1499 $post_params_str = implode( ", \n", $p ); 1491 1500 … … 1493 1502 <script type="text/javascript"> 1494 1503 //<![CDATA[ 1495 var resize_height = <?php echo get_option('large_size_h' ); ?>,1496 resize_width = <?php echo get_option('large_size_w' ); ?>;1504 var resize_height = <?php echo get_option('large_size_h', 1024); ?>, 1505 resize_width = <?php echo get_option('large_size_w', 1024); ?>; 1497 1506 1498 1507 jQuery(document).ready(function($) { … … 1503 1512 drop_element: 'media-upload', 1504 1513 file_data_name: 'async-upload', 1505 max_file_size: '<?php echo $max_upload_size / 1024; ?>kb',1506 url: '<?php echo esc_ attr( $upload_action_url ); ?>',1507 flash_swf_url: '<?php echo includes_url('js/plupload/plupload.flash.swf'); ?>',1508 silverlight_xap_url: '<?php echo includes_url('js/plupload/plupload.silverlight.xap'); ?>',1514 max_file_size: '<?php echo round( (int) $max_upload_size / 1024 ); ?>kb', 1515 url: '<?php echo esc_js( $upload_action_url ); ?>', 1516 flash_swf_url: '<?php echo esc_js( includes_url('js/plupload/plupload.flash.swf') ); ?>', 1517 silverlight_xap_url: '<?php echo esc_js( includes_url('js/plupload/plupload.silverlight.xap') ); ?>', 1509 1518 filters: [ 1510 {title: '<?php _e( 'Allowed Files' ); ?>', extensions: '<?php echo apply_filters('upload_file_glob', '*'); ?>'}1519 {title: '<?php echo esc_js( __( 'Allowed Files' ) ); ?>', extensions: '<?php echo esc_js( apply_filters('uploader_allowed_extensions', '*') ); ?>'} 1511 1520 ], 1512 1521 multipart: true, … … 1589 1598 </div> 1590 1599 1591 <p class="media-upload-size"><?php printf( __( 'Maximum upload file size: %d%s' ), $upload_size_unit, $sizes[$u]); ?></p>1600 <p class="media-upload-size"><?php printf( __( 'Maximum upload file size: %d%s' ), esc_html($upload_size_unit), esc_html($sizes[$u]) ); ?></p> 1592 1601 <p class="howto"><?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></p> 1593 1602 … … 1634 1643 //]]> 1635 1644 </script> 1636 <div id="media-items"> 1637 <?php 1645 <div id="media-items"><?php 1646 1638 1647 if ( $id ) { 1639 1648 if ( !is_wp_error($id) ) { … … 1641 1650 echo get_media_items( $id, $errors ); 1642 1651 } else { 1643 echo '<div id="media-upload-error">'.esc_html($id->get_error_message()).'</div> ';1652 echo '<div id="media-upload-error">'.esc_html($id->get_error_message()).'</div></div>'; 1644 1653 exit; 1645 1654 } 1646 1655 } 1647 ?> 1648 </div> 1656 ?></div> 1657 1649 1658 <p class="savebutton ml-submit"> 1650 1659 <?php submit_button( __( 'Save all changes' ), 'button', 'save', false ); ?>
Note: See TracChangeset
for help on using the changeset viewer.