<?php bloginfo('name') ?> › <?php _e('Uploads'); ?>

" . sprintf( __( 'You are about to delete %s.' ), $filename ) . " - " . __( 'Continue' ) . " + "; } else { - $delete = "" . __( 'Move to Trash' ) . " - "; + $delete = "" . __( 'Move to Trash' ) . " + "; } } else { $delete = ''; @@ -1324,7 +1198,8 @@ function get_media_item( $attachment_id, $args = null ) { $calling_post_id = absint( $_GET['post_id'] ); elseif ( isset( $_POST ) && count( $_POST ) ) // Like for async-upload where $_GET['post_id'] isn't set $calling_post_id = $post->post_parent; - if ( 'image' == $type && $calling_post_id && current_theme_supports( 'post-thumbnails', get_post_type( $calling_post_id ) ) && get_post_thumbnail_id( $calling_post_id ) != $attachment_id ) { + if ( 'image' == $type && $calling_post_id && current_theme_supports( 'post-thumbnails', get_post_type( $calling_post_id ) ) + && post_type_supports( get_post_type( $calling_post_id ), 'thumbnail' ) && get_post_thumbnail_id( $calling_post_id ) != $attachment_id ) { $ajax_nonce = wp_create_nonce( "set_post_thumbnail-$calling_post_id" ); $thumbnail = "" . esc_html__( "Use as featured image" ) . ""; } @@ -1360,10 +1235,12 @@ function get_media_item( $attachment_id, $args = null ) { if ( !empty( $field[ $field['input'] ] ) ) $item .= $field[ $field['input'] ]; elseif ( $field['input'] == 'textarea' ) { - if ( user_can_richedit() ) { // textarea_escaped when user_can_richedit() = false - $field['value'] = esc_textarea( $field['value'] ); + if ( 'post_content' == $id && user_can_richedit() ) { + // sanitize_post() skips the post_content when user_can_richedit + $field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES ); } - $item .= "'; + // post_excerpt is already escaped by sanitize_post() in get_attachment_fields_to_edit() + $item .= "'; } else { $item .= ""; } @@ -1404,18 +1281,164 @@ function get_media_item( $attachment_id, $args = null ) { return $item; } -/** - * {@internal Missing Short Description}} - * - * @since 2.5.0 +function get_compat_media_markup( $attachment_id, $args = null ) { + $post = get_post( $attachment_id ); + + $default_args = array( + 'errors' => null, + 'in_modal' => false, + ); + + $user_can_edit = current_user_can( 'edit_post', $attachment_id ); + + $args = wp_parse_args( $args, $default_args ); + $args = apply_filters( 'get_media_item_args', $args ); + + $form_fields = array(); + + if ( $args['in_modal'] ) { + foreach ( get_attachment_taxonomies($post) as $taxonomy ) { + $t = (array) get_taxonomy($taxonomy); + if ( ! $t['public'] || ! $t['show_ui'] ) + continue; + if ( empty($t['label']) ) + $t['label'] = $taxonomy; + if ( empty($t['args']) ) + $t['args'] = array(); + + $terms = get_object_term_cache($post->ID, $taxonomy); + if ( false === $terms ) + $terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']); + + $values = array(); + + foreach ( $terms as $term ) + $values[] = $term->slug; + $t['value'] = join(', ', $values); + $t['taxonomy'] = true; + + $form_fields[$taxonomy] = $t; + } + } + + // Merge default fields with their errors, so any key passed with the error (e.g. 'error', 'helps', 'value') will replace the default + // The recursive merge is easily traversed with array casting: foreach( (array) $things as $thing ) + $form_fields = array_merge_recursive($form_fields, (array) $args['errors'] ); + + $form_fields = apply_filters( 'attachment_fields_to_edit', $form_fields, $post ); + + unset( $form_fields['image-size'], $form_fields['align'], $form_fields['image_alt'], + $form_fields['post_title'], $form_fields['post_excerpt'], $form_fields['post_content'], + $form_fields['url'], $form_fields['menu_order'], $form_fields['image_url'] ); + + $media_meta = apply_filters( 'media_meta', '', $post ); + + $defaults = array( + 'input' => 'text', + 'required' => false, + 'value' => '', + 'extra_rows' => array(), + 'show_in_edit' => true, + 'show_in_modal' => true, + ); + + $hidden_fields = array(); + + $item = ''; + foreach ( $form_fields as $id => $field ) { + if ( $id[0] == '_' ) + continue; + + $name = "attachments[$attachment_id][$id]"; + $id_attr = "attachments-$attachment_id-$id"; + + if ( !empty( $field['tr'] ) ) { + $item .= $field['tr']; + continue; + } + + $field = array_merge( $defaults, $field ); + + if ( ( ! $field['show_in_edit'] && ! $args['in_modal'] ) || ( ! $field['show_in_modal'] && $args['in_modal'] ) ) + continue; + + if ( $field['input'] == 'hidden' ) { + $hidden_fields[$name] = $field['value']; + continue; + } + + $readonly = ! $user_can_edit && ! empty( $field['taxonomy'] ) ? " readonly='readonly' " : ''; + $required = $field['required'] ? '*' : ''; + $aria_required = $field['required'] ? " aria-required='true' " : ''; + $class = 'compat-field-' . $id; + $class .= $field['required'] ? ' form-required' : ''; + + $item .= "\t\t"; + $item .= "\t\t\t{$field['label']}$required
"; + $item .= "\n\t\t\t"; + + if ( !empty( $field[ $field['input'] ] ) ) + $item .= $field[ $field['input'] ]; + elseif ( $field['input'] == 'textarea' ) { + if ( 'post_content' == $id && user_can_richedit() ) { + // sanitize_post() skips the post_content when user_can_richedit + $field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES ); + } + $item .= "'; + } else { + $item .= ""; + } + if ( !empty( $field['helps'] ) ) + $item .= "

" . join( "

", array_unique( (array) $field['helps'] ) ) . '

'; + $item .= "\n\t\t\n"; + + $extra_rows = array(); + + if ( !empty( $field['errors'] ) ) + foreach ( array_unique( (array) $field['errors'] ) as $error ) + $extra_rows['error'][] = $error; + + if ( !empty( $field['extra_rows'] ) ) + foreach ( $field['extra_rows'] as $class => $rows ) + foreach ( (array) $rows as $html ) + $extra_rows[$class][] = $html; + + foreach ( $extra_rows as $class => $rows ) + foreach ( $rows as $html ) + $item .= "\t\t$html\n"; + } + + if ( !empty( $form_fields['_final'] ) ) + $item .= "\t\t{$form_fields['_final']}\n"; + if ( $item ) + $item = '' . $item . '

'; + + foreach ( $hidden_fields as $hidden_field => $value ) { + $item .= '' . "\n"; + } + + if ( $item ) + $item = '' . $item; + + return array( + 'item' => $item, + 'meta' => $media_meta, + ); +} + +/** + * {@internal Missing Short Description}} + * + * @since 2.5.0 */ function media_upload_header() { - ?> - -

- -

- post_id = ' . $post_id . ";\n"; + if ( empty( $_GET['chromeless'] ) ) { + echo '

'; + the_media_upload_tabs(); + echo '

'; + } } /** @@ -1426,22 +1449,25 @@ function media_upload_header() { * @param unknown_type $errors */ function media_upload_form( $errors = null ) { - global $type, $tab, $pagenow; + global $type, $tab, $pagenow, $is_IE, $is_opera; - $flash_action_url = admin_url('async-upload.php'); - - // If Mac and mod_security, no Flash. :( - $flash = true; - if ( false !== stripos($_SERVER['HTTP_USER_AGENT'], 'mac') && apache_mod_loaded('mod_security') ) - $flash = false; + if ( ! _device_can_upload() ) { + echo '

' . __('The web browser on your device cannot be used to upload files. You may be able to use the native app for your device instead.') . '

'; + return; + } - $flash = apply_filters('flash_uploader', $flash); + $upload_action_url = admin_url('async-upload.php'); $post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0; + $_type = isset($type) ? $type : ''; + $_tab = isset($tab) ? $tab : ''; - $upload_size_unit = $max_upload_size = wp_max_upload_size(); + $upload_size_unit = $max_upload_size = wp_max_upload_size(); $sizes = array( 'KB', 'MB', 'GB' ); - for ( $u = -1; $upload_size_unit > 1024 && $u < count( $sizes ) - 1; $u++ ) + + for ( $u = -1; $upload_size_unit > 1024 && $u < count( $sizes ) - 1; $u++ ) { $upload_size_unit /= 1024; + } + if ( $u < 0 ) { $upload_size_unit = 0; $u = 0; @@ -1449,122 +1475,90 @@ function media_upload_form( $errors = null ) { $upload_size_unit = (int) $upload_size_unit; } ?> - -

- - - -

- - get_error_message(); ?> - -

+ +

get_error_message(); + +?>

' . sprintf( __( 'Sorry, you have filled your storage quota (%s MB).' ), get_space_allowed() ) . '

'; + do_action( 'upload_ui_over_quota' ); return; } do_action('pre-upload-ui'); -if ( $flash ) : - -// Set the post params, which SWFUpload will post back with the file, and pass -// them through a filter. $post_params = array( "post_id" => $post_id, - "auth_cookie" => (is_ssl() ? $_COOKIE[SECURE_AUTH_COOKIE] : $_COOKIE[AUTH_COOKIE]), - "logged_in_cookie" => $_COOKIE[LOGGED_IN_COOKIE], "_wpnonce" => wp_create_nonce('media-form'), - "type" => $type, - "tab" => $tab, + "type" => $_type, + "tab" => $_tab, "short" => "1", ); -$post_params = apply_filters( 'swfupload_post_params', $post_params ); -$p = array(); -foreach ( $post_params as $param => $val ) - $p[] = "\t\t'$param' : '$val'"; -$post_params_str = implode( ", \n", $p ); - -// #8545. wmode=transparent cannot be used with SWFUpload -if ( 'media-new.php' == $pagenow ) { - $upload_image_path = get_user_option( 'admin_color' ); - if ( 'classic' != $upload_image_path ) - $upload_image_path = 'fresh'; - $upload_image_path = admin_url( 'images/upload-' . $upload_image_path . '.png?ver=20101205' ); -} else { - $upload_image_path = includes_url( 'images/upload.png?ver=20100531' ); -} + +$post_params = apply_filters( 'upload_post_params', $post_params ); // hook change! old name: 'swfupload_post_params' + +$plupload_init = array( + 'runtimes' => 'html5,silverlight,flash,html4', + 'browse_button' => 'plupload-browse-button', + 'container' => 'plupload-upload-ui', + 'drop_element' => 'drag-drop-area', + 'file_data_name' => 'async-upload', + 'multiple_queues' => true, + 'max_file_size' => $max_upload_size . 'b', + 'url' => $upload_action_url, + 'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'), + 'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'), + 'filters' => array( array('title' => __( 'Allowed Files' ), 'extensions' => '*') ), + 'multipart' => true, + 'urlstream_upload' => true, + 'multipart_params' => $post_params +); + +// Multi-file uploading doesn't currently work in iOS Safari, +// single-file allows the built-in camera to be used as source for images +if ( wp_is_mobile() ) + $plupload_init['multi_selection'] = false; + +$plupload_init = apply_filters( 'plupload_init', $plupload_init ); ?> + -

- - -

- -

- +

+ +

- -

- + +

@@ -1573,14 +1567,16 @@ SWFUpload.onload = function() {

- -

- - +

- + + 100 * 1024 * 1024 ) { ?> + + -

'; exit; } } -?> -

+?>

@@ -1646,28 +1647,31 @@ if ( $id ) { * * @since 2.7.0 * - * @param unknown_type $type - * @param unknown_type $errors - * @param unknown_type $id + * @param string $type + * @param object $errors + * @param integer $id */ -function media_upload_type_url_form($type = 'file', $errors = null, $id = null) { +function media_upload_type_url_form($type = null, $errors = null, $id = null) { + if ( null === $type ) + $type = 'image'; + media_upload_header(); - $post_id = intval($_REQUEST['post_id']); + $post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0; $form_action_url = admin_url("media-upload.php?type=$type&tab=type&post_id=$post_id"); $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type); + $form_class = 'media-upload-form type-form validate'; - $callback = "type_url_form_$type"; + if ( get_user_setting('uploader') ) + $form_class .= ' html-uploader'; ?> - + - - -

- +