diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 396d0d597..aca72f3d9 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -1019,6 +1019,8 @@ function get_attachment_fields_to_edit($post, $errors = null) {
$edit_post = sanitize_post($post, 'edit');
+
+
$form_fields = array(
'post_title' => array(
'label' => __('Title'),
@@ -1131,7 +1133,7 @@ function get_media_items( $post_id, $errors ) {
function get_media_item( $attachment_id, $args = null ) {
global $redir_tab;
- if ( ( $attachment_id = intval($attachment_id) ) && $thumb_url = get_attachment_icon_src( $attachment_id ) )
+ if ( ( $attachment_id = intval( $attachment_id ) ) && $thumb_url = get_attachment_icon_src( $attachment_id ) )
$thumb_url = $thumb_url[0];
else
return false;
@@ -1140,29 +1142,29 @@ function get_media_item( $attachment_id, $args = null ) {
$args = wp_parse_args( $args, $default_args );
extract( $args, EXTR_SKIP );
- $toggle_on = __('Show');
- $toggle_off = __('Hide');
+ $toggle_on = __( 'Show' );
+ $toggle_off = __( 'Hide' );
- $post = get_post($attachment_id);
+ $post = get_post( $attachment_id );
- $filename = basename($post->guid);
- $title = esc_attr($post->post_title);
+ $filename = basename( $post->guid );
+ $title = esc_attr( $post->post_title );
- if ( $_tags = get_the_tags($attachment_id) ) {
+ if ( $_tags = get_the_tags( $attachment_id ) ) {
foreach ( $_tags as $tag )
$tags[] = $tag->name;
- $tags = esc_attr(join(', ', $tags));
+ $tags = esc_attr( join( ', ', $tags ) );
}
$post_mime_types = get_post_mime_types();
- $keys = array_keys(wp_match_mime_types(array_keys($post_mime_types), $post->post_mime_type));
- $type = array_shift($keys);
+ $keys = array_keys( wp_match_mime_types( array_keys( $post_mime_types ), $post->post_mime_type ) );
+ $type = array_shift( $keys );
$type_html = "";
- $form_fields = get_attachment_fields_to_edit($post, $errors);
+ $form_fields = get_attachment_fields_to_edit( $post, $errors );
if ( $toggle ) {
- $class = empty($errors) ? 'startclosed' : 'startopen';
+ $class = empty( $errors ) ? 'startclosed' : 'startopen';
$toggle_links = "
$toggle_on
$toggle_off";
@@ -1172,33 +1174,33 @@ function get_media_item( $attachment_id, $args = null ) {
}
$display_title = ( !empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case
- $display_title = $show_title ? "
" . wp_html_excerpt($display_title, 60) . "
" : '';
+ $display_title = $show_title ? "" . wp_html_excerpt( $display_title, 60 ) . "
" : '';
- $gallery = ( (isset($_REQUEST['tab']) && 'gallery' == $_REQUEST['tab']) || (isset($redir_tab) && 'gallery' == $redir_tab) ) ? true : false;
+ $gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' == $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' == $redir_tab ) ) ? true : false;
$order = '';
foreach ( $form_fields as $key => $val ) {
if ( 'menu_order' == $key ) {
if ( $gallery )
- $order = '';
+ $order = "";
else
- $order = '';
+ $order = "";
- unset($form_fields['menu_order']);
+ unset( $form_fields['menu_order'] );
break;
}
}
$media_dims = '';
- $meta = wp_get_attachment_metadata($post->ID);
- if ( is_array($meta) && array_key_exists('width', $meta) && array_key_exists('height', $meta) )
- $media_dims .= "{$meta['width']} × {$meta['height']} ";
- $media_dims = apply_filters('media_meta', $media_dims, $post);
+ $meta = wp_get_attachment_metadata( $post->ID );
+ if ( is_array( $meta ) && array_key_exists( 'width', $meta ) && array_key_exists( 'height', $meta ) )
+ $media_dims .= "{$meta['width']} × {$meta['height']} ";
+ $media_dims = apply_filters( 'media_meta', $media_dims, $post );
$image_edit_button = '';
- if ( gd_edit_image_support($post->post_mime_type) ) {
- $nonce = wp_create_nonce("image_editor-$post->ID");
- $image_edit_button = " ";
+ if ( gd_edit_image_support( $post->post_mime_type ) ) {
+ $nonce = wp_create_nonce( "image_editor-$post->ID" );
+ $image_edit_button = " ";
}
$attachment_url = get_permalink( $attachment_id );
@@ -1210,20 +1212,23 @@ function get_media_item( $attachment_id, $args = null ) {
$display_title
-
-
-
+ |
+
+
+ $image_edit_button
|
- " . __('File name:') . " $filename |
-
- " . __('File type:') . " $post->post_mime_type |
- " . __('Upload date:') . " " . mysql2date( get_option('date_format'), $post->post_date ) . " |
\n";
+
+ " . __('File name:') . " $filename
+ " . __('File type:') . " $post->post_mime_type
+ " . __('Upload date:') . " " . mysql2date( get_option('date_format'), $post->post_date ). ' ';
+ if ( !empty( $media_dims ) )
+ $item .= "" . __('Dimensions:') . " $media_dims \n";
+
+ echo " | \n";
- if ( !empty($media_dims) )
- $item .= "" . __('Dimensions:') . " $media_dims |
\n";
+
$item .= "
- $image_edit_button |
|
@@ -1238,13 +1243,18 @@ function get_media_item( $attachment_id, $args = null ) {
if ( $send )
$send = "";
- if ( $delete && current_user_can('delete_post', $attachment_id) ) {
+ if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) {
if ( !EMPTY_TRASH_DAYS ) {
- $delete = "" . __('Delete Permanently') . "";
+ $delete = "" . __( 'Delete Permanently' ) . '';
} elseif ( !MEDIA_TRASH ) {
- $delete = "" . __('Delete') . " ";
+ $delete = "" . __( 'Delete' ) . "
+ ";
} else {
- $delete = "" . __('Move to Trash') . " " . __('Undo') . "";
+ $delete = "" . __( 'Move to Trash' ) . "
+ " . __( 'Undo' ) . "";
}
} else {
$delete = '';
@@ -1259,8 +1269,8 @@ function get_media_item( $attachment_id, $args = null ) {
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 )
$thumbnail = "" . esc_html__( "Use as thumbnail" ) . "";
- if ( ( $send || $thumbnail || $delete ) && !isset($form_fields['buttons']) )
- $form_fields['buttons'] = array('tr' => "\t\t | $send $thumbnail $delete |
\n");
+ if ( ( $send || $thumbnail || $delete ) && !isset( $form_fields['buttons'] ) )
+ $form_fields['buttons'] = array( 'tr' => "\t\t | $send $thumbnail $delete |
\n" );
$hidden_fields = array();
@@ -1268,12 +1278,12 @@ function get_media_item( $attachment_id, $args = null ) {
if ( $id{0} == '_' )
continue;
- if ( !empty($field['tr']) ) {
+ if ( !empty( $field['tr'] ) ) {
$item .= $field['tr'];
continue;
}
- $field = array_merge($defaults, $field);
+ $field = array_merge( $defaults, $field );
$name = "attachments[$attachment_id][$id]";
if ( $field['input'] == 'hidden' ) {
@@ -1281,30 +1291,30 @@ function get_media_item( $attachment_id, $args = null ) {
continue;
}
- $required = $field['required'] ? '*' : '';
+ $required = $field['required'] ? '*' : '';
$aria_required = $field['required'] ? " aria-required='true' " : '';
$class = $id;
$class .= $field['required'] ? ' form-required' : '';
$item .= "\t\t\n\t\t\t | \n\t\t\t";
- if ( !empty($field[$field['input']]) )
- $item .= $field[$field['input']];
+ if ( !empty( $field[ $field['input'] ] ) )
+ $item .= $field[ $field['input'] ];
elseif ( $field['input'] == 'textarea' ) {
- $item .= "";
+ $item .= "';
} else {
- $item .= "";
+ $item .= "";
}
- if ( !empty($field['helps']) )
- $item .= " " . join( " \n", array_unique((array) $field['helps']) ) . ' ';
+ if ( !empty( $field['helps'] ) )
+ $item .= "" . join( " \n", 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 )
+ if ( !empty( $field['errors'] ) )
+ foreach ( array_unique( (array) $field['errors'] ) as $error )
$extra_rows['error'][] = $error;
- if ( !empty($field['extra_rows']) )
+ if ( !empty( $field['extra_rows'] ) )
foreach ( $field['extra_rows'] as $class => $rows )
foreach ( (array) $rows as $html )
$extra_rows[$class][] = $html;
@@ -1314,7 +1324,7 @@ function get_media_item( $attachment_id, $args = null ) {
$item .= "\t\t | $html |
\n";
}
- if ( !empty($form_fields['_final']) )
+ if ( !empty( $form_fields['_final'] ) )
$item .= "\t\t{$form_fields['_final']} |
\n";
$item .= "\t\n";
$item .= "\t
\n";
@@ -1322,11 +1332,10 @@ function get_media_item( $attachment_id, $args = null ) {
foreach ( $hidden_fields as $name => $value )
$item .= "\t\n";
- if ( $post->post_parent < 1 && isset($_REQUEST['post_id']) ) {
+ if ( $post->post_parent < 1 && isset( $_REQUEST['post_id'] ) ) {
$parent = (int) $_REQUEST['post_id'];
$parent_name = "attachments[$attachment_id][post_parent]";
-
- $item .= "\t\n";
+ $item .= "\t\n";
}
return $item;
diff --git a/wp-admin/media.php b/wp-admin/media.php
index 403b9eb16..8fe1baaf2 100644
--- a/wp-admin/media.php
+++ b/wp-admin/media.php
@@ -90,7 +90,7 @@ case 'edit' :