X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8f374b7233bc2815ccc387e448d208c5434eb961..9441756a895fb4fdc4bcf20e0d228cef622663ca:/wp-admin/includes/media.php diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 179bfb8f..9990b9fd 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -7,11 +7,11 @@ */ /** - * {@internal Missing Short Description}} + * Defines the default media upload tabs * * @since 2.5.0 * - * @return unknown + * @return array default tabs */ function media_upload_tabs() { $_default_tabs = array( @@ -21,16 +21,25 @@ function media_upload_tabs() { 'library' => __('Media Library') ); - return apply_filters('media_upload_tabs', $_default_tabs); + /** + * Filter the available tabs in the legacy (pre-3.5.0) media popup. + * + * @since 2.5.0 + * + * @param array $_default_tabs An array of media tabs. + */ + return apply_filters( 'media_upload_tabs', $_default_tabs ); } /** - * {@internal Missing Short Description}} + * Adds the gallery tab back to the tabs array if post has image attachments * * @since 2.5.0 * - * @param unknown_type $tabs - * @return unknown + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param array $tabs + * @return array $tabs with gallery if post has image attachment */ function update_gallery_tab($tabs) { global $wpdb; @@ -54,12 +63,13 @@ function update_gallery_tab($tabs) { return $tabs; } -add_filter('media_upload_tabs', 'update_gallery_tab'); /** - * {@internal Missing Short Description}} + * Outputs the legacy media upload tabs UI. * * @since 2.5.0 + * + * @global string $redir_tab */ function the_media_upload_tabs() { global $redir_tab; @@ -68,12 +78,14 @@ function the_media_upload_tabs() { if ( !empty($tabs) ) { echo "
$image_edit_button @@ -1152,20 +1474,25 @@ function get_media_item( $attachment_id, $args = null ) { 'extra_rows' => array(), ); - if ( $send ) - $send = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false ); + if ( $r['send'] ) { + $r['send'] = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false ); + } + + $delete = empty( $r['delete'] ) ? '' : $r['delete']; if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) { if ( !EMPTY_TRASH_DAYS ) { - $delete = "" . __( 'Delete Permanently' ) . ''; + $delete = "" . __( 'Delete Permanently' ) . ''; } elseif ( !MEDIA_TRASH ) { $delete = "" . __( 'Delete' ) . " -" . sprintf( __( 'You are about to delete %s.' ), $filename ) . " - " . __( 'Continue' ) . " +" .
+ /* translators: %s: file name */
+ ' ";
} else {
- $delete = "" . __( 'Move to Trash' ) . "
- " . __( 'Undo' ) . "";
+ $delete = "" . __( 'Move to Trash' ) . "
+ " . __( 'Undo' ) . "";
}
} else {
$delete = '';
@@ -1173,19 +1500,24 @@ function get_media_item( $attachment_id, $args = null ) {
$thumbnail = '';
$calling_post_id = 0;
- if ( isset( $_GET['post_id'] ) )
+ if ( isset( $_GET['post_id'] ) ) {
$calling_post_id = absint( $_GET['post_id'] );
- elseif ( isset( $_POST ) && count( $_POST ) ) // Like for async-upload where $_GET['post_id'] isn't set
+ } 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 ) )
&& post_type_supports( get_post_type( $calling_post_id ), 'thumbnail' ) && get_post_thumbnail_id( $calling_post_id ) != $attachment_id ) {
+
+ $calling_post = get_post( $calling_post_id );
+ $calling_post_type_object = get_post_type_object( $calling_post->post_type );
+
$ajax_nonce = wp_create_nonce( "set_post_thumbnail-$calling_post_id" );
- $thumbnail = "" . esc_html__( "Use as featured image" ) . "";
+ $thumbnail = "" . esc_html( $calling_post_type_object->labels->use_featured_image ) . "";
}
- if ( ( $send || $thumbnail || $delete ) && !isset( $form_fields['buttons'] ) )
- $form_fields['buttons'] = array( 'tr' => "\t\t' . sprintf( __( 'You are about to delete %s.' ), '' . $filename . '' ) . " + " . __( 'Continue' ) . " " . __( 'Cancel' ) . "$send $thumbnail $delete | " . $r['send'] . " $thumbnail $delete | \n\t\t\t | ";
+ $item .= "\t\t | \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
+ // Sanitize_post() skips the post_content when user_can_richedit.
$field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
}
- // post_excerpt is already escaped by sanitize_post() in get_attachment_fields_to_edit()
+ // Post_excerpt is already escaped by sanitize_post() in get_attachment_fields_to_edit().
$item .= "';
} else {
$item .= "";
@@ -1261,31 +1593,194 @@ function get_media_item( $attachment_id, $args = null ) {
}
/**
- * {@internal Missing Short Description}}
+ * @since 3.5.0
+ *
+ * @param int $attachment_id
+ * @param array $args
+ * @return array
+ */
+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 );
+
+ /** This filter is documented in wp-admin/includes/media.php */
+ $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'] );
+
+ /** This filter is documented in wp-admin/includes/media.php */
+ $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'] );
+
+ /** This filter is documented in wp-admin/includes/media.php */
+ $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 .= " | \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 .= " | \n\t\t" . join( " \n", array_unique( (array) $field['helps'] ) ) . ' '; + $item .= "$html | {$form_fields['_final']} |
-
-
- post_id = ' . $post_id . ';';
+ if ( empty( $_GET['chromeless'] ) ) {
+ echo '';
+ the_media_upload_tabs();
+ echo ' ';
+ }
}
/**
- * {@internal Missing Short Description}}
+ * Outputs the legacy media upload form.
*
* @since 2.5.0
*
- * @param unknown_type $errors
+ * @global string $type
+ * @global string $tab
+ * @global bool $is_IE
+ * @global bool $is_opera
+ *
+ * @param array $errors
*/
function media_upload_form( $errors = null ) {
- global $type, $tab, $pagenow, $is_IE, $is_opera;
+ global $type, $tab, $is_IE, $is_opera;
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.') . ' '; + echo '' . sprintf( __('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.'), 'https://apps.wordpress.org/' ) . ' '; return; } @@ -1294,18 +1789,9 @@ function media_upload_form( $errors = null ) { $_type = isset($type) ? $type : ''; $_tab = isset($tab) ? $tab : ''; - $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++ ) { - $upload_size_unit /= 1024; - } - - if ( $u < 0 ) { - $upload_size_unit = 0; - $u = 0; - } else { - $upload_size_unit = (int) $upload_size_unit; + $max_upload_size = wp_max_upload_size(); + if ( ! $max_upload_size ) { + $max_upload_size = 0; } ?> @@ -1322,41 +1808,71 @@ function media_upload_form( $errors = null ) { ?>
-
+
-
+
100 * 1024 * 1024 ) { ?>
-
-
-
@@ -1384,38 +1907,63 @@ wpUploaderInit = ;
|