*
* @since 2.5.0
*
- * @global wpdb $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
*
* @param array $tabs
* @return array $tabs with gallery if post has image attachment
}
/**
- * {@internal Missing Short Description}}
+ * Outputs the legacy media upload tabs UI.
*
* @since 2.5.0
*
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the image HTML to send to the editor.
*
* @since 2.5.0
*
- * @param integer $id image attachment id
- * @param string $caption image caption
- * @param string $alt image alt attribute
- * @param string $title image title attribute
- * @param string $align image css alignment property
- * @param string $url image src url
- * @param string|bool $rel image rel attribute
- * @param string $size image size (thumbnail, medium, large, full or added with add_image_size() )
- * @return string the html to insert into editor
+ * @param int $id Image attachment id.
+ * @param string $caption Image caption.
+ * @param string $title Image title attribute.
+ * @param string $align Image CSS alignment property.
+ * @param string $url Optional. Image src URL. Default empty.
+ * @param bool|string $rel Optional. Value for rel attribute or whether to add a dafault value. Default false.
+ * @param string|array $size Optional. Image size. Accepts any valid image size, or an array of width
+ * and height values in pixels (in that order). Default 'medium'.
+ * @param string $alt Optional. Image alt attribute. Default empty.
+ * @return string The HTML output to insert into the editor.
*/
-function get_image_send_to_editor($id, $caption, $title, $align, $url='', $rel = false, $size='medium', $alt = '') {
+function get_image_send_to_editor( $id, $caption, $title, $align, $url = '', $rel = false, $size = 'medium', $alt = '' ) {
- $html = get_image_tag($id, $alt, '', $align, $size);
+ $html = get_image_tag( $id, $alt, '', $align, $size );
- $rel = $rel ? ' rel="attachment wp-att-' . esc_attr($id).'"' : '';
+ if ( $rel ) {
+ if ( is_string( $rel ) ) {
+ $rel = ' rel="' . esc_attr( $rel ) . '"';
+ } else {
+ $rel = ' rel="attachment wp-att-' . intval( $id ) . '"';
+ }
+ } else {
+ $rel = '';
+ }
if ( $url )
- $html = '<a href="' . esc_attr($url) . "\"$rel>$html</a>";
+ $html = '<a href="' . esc_attr( $url ) . '"' . $rel . '>' . $html . '</a>';
/**
* Filter the image HTML markup to send to the editor.
*
* @since 2.5.0
*
- * @param string $html The image HTML markup to send.
- * @param int $id The attachment id.
- * @param string $caption The image caption.
- * @param string $title The image title.
- * @param string $align The image alignment.
- * @param string $url The image source URL.
- * @param string $size The image size.
- * @param string $alt The image alternative, or alt, text.
+ * @param string $html The image HTML markup to send.
+ * @param int $id The attachment id.
+ * @param string $caption The image caption.
+ * @param string $title The image title.
+ * @param string $align The image alignment.
+ * @param string $url The image source URL.
+ * @param string|array $size Size of image. Image size or array of width and height values
+ * (in that order). Default 'medium'.
+ * @param string $alt The image alternative, or alt, text.
*/
$html = apply_filters( 'image_send_to_editor', $html, $id, $caption, $title, $align, $url, $size, $alt );
* @param string $html
* @param integer $id
* @param string $caption image caption
- * @param string $alt image alt attribute
* @param string $title image title attribute
* @param string $align image css alignment property
* @param string $url image src url
* @param string $size image size (thumbnail, medium, large, full or added with add_image_size() )
+ * @param string $alt image alt attribute
* @return string
*/
function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $alt = '' ) {
?>
<script type="text/javascript">
var win = window.dialogArguments || opener || parent || top;
-win.send_to_editor('<?php echo addslashes($html); ?>');
+win.send_to_editor( <?php echo wp_json_encode( $html ); ?> );
</script>
<?php
exit;
// Check callback name for 'media'
if ( ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) )
|| ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) ) )
- wp_enqueue_style( 'media' );
+ wp_enqueue_style( 'deprecated-media' );
wp_enqueue_style( 'ie' );
?>
<script type="text/javascript">
}
/**
- * {@internal Missing Short Description}}
+ * Handles form submissions for the legacy media uploader.
*
* @since 2.5.0
*
*
* @see wp_get_attachment_metadata()
*
- * @param WP_Post $post The WP_Post object.
- * @param array $attachment An array of attachment metadata.
+ * @param array $post An array of post data.
+ * @param array $attachment An array of attachment metadata.
*/
$post = apply_filters( 'attachment_fields_to_save', $post, $attachment );
}
/**
- * {@internal Missing Short Description}}
+ * Handles the process of uploading media.
*
* @since 2.5.0
*
if ( isset( $_POST['save'] ) ) {
$errors['upload_notice'] = __('Saved.');
- return media_upload_gallery();
+ wp_enqueue_script( 'admin-gallery' );
+ return wp_iframe( 'media_upload_gallery_form', $errors );
+
} elseif ( ! empty( $_POST ) ) {
$return = media_upload_form_handler();
// Set variables for storage, fix file filename for query strings.
preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches );
+ if ( ! $matches ) {
+ return new WP_Error( 'image_sideload_failed', __( 'Invalid image URL' ) );
+ }
+
$file_array = array();
$file_array['name'] = basename( $matches[0] );
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the legacy media uploader form in an iframe.
*
* @since 2.5.0
*
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the legacy media library form in an iframe.
*
* @since 2.5.0
*
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the image attachment fields to edit form fields.
*
* @since 2.5.0
*
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the single non-image attachment fields to edit form fields.
*
* @since 2.5.0
*
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the post non-image attachment fields to edito form fields.
*
* @since 2.8.0
*
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the media element HTML to send to the editor.
*
* @since 2.5.0
*
$align = !empty($attachment['align']) ? $attachment['align'] : 'none';
$size = !empty($attachment['image-size']) ? $attachment['image-size'] : 'medium';
$alt = !empty($attachment['image_alt']) ? $attachment['image_alt'] : '';
- $rel = ( $url == get_attachment_link($attachment_id) );
+ $rel = ( strpos( $url, 'attachment_id') || $url === get_attachment_link( $attachment_id ) );
return get_image_send_to_editor($attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size, $alt);
}
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the attachment fields to edit form fields.
*
* @since 2.5.0
*
}
// 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 )
+ // The recursive merge is easily traversed with array casting: foreach ( (array) $things as $thing )
$form_fields = array_merge_recursive($form_fields, (array) $errors);
// This was formerly in image_attachment_fields_to_edit().
$toggle_on = __( 'Show' );
$toggle_off = __( 'Hide' );
- $filename = esc_html( wp_basename( $post->guid ) );
+ $file = get_attached_file( $post->ID );
+ $filename = esc_html( wp_basename( $file ) );
$title = esc_attr( $post->post_title );
$post_mime_types = get_post_mime_types();
<td>
<p><strong>" . __('File name:') . "</strong> $filename</p>
<p><strong>" . __('File type:') . "</strong> $post->post_mime_type</p>
- <p><strong>" . __('Upload date:') . "</strong> " . mysql2date( get_option('date_format'), $post->post_date ). '</p>';
+ <p><strong>" . __('Upload date:') . "</strong> " . mysql2date( __( 'F j, Y' ), $post->post_date ). '</p>';
if ( !empty( $media_dims ) )
$item .= "<p><strong>" . __('Dimensions:') . "</strong> $media_dims</p>\n";
$item .= "
</thead>
<tbody>
- <tr><td colspan='2' class='imgedit-response' id='imgedit-response-$post->ID'></td></tr>
- <tr><td style='display:none' colspan='2' class='image-editor' id='image-editor-$post->ID'></td></tr>\n";
+ <tr><td colspan='2' class='imgedit-response' id='imgedit-response-$post->ID'></td></tr>\n
+ <tr><td style='display:none' colspan='2' class='image-editor' id='image-editor-$post->ID'></td></tr>\n
+ <tr><td colspan='2'><p class='media-types media-types-required-info'>" . sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) . "</p></td></tr>\n";
$defaults = array(
'input' => 'text',
$delete = "<a href='" . wp_nonce_url( "post.php?action=delete&post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete-permanently'>" . __( 'Delete Permanently' ) . '</a>';
} elseif ( !MEDIA_TRASH ) {
$delete = "<a href='#' class='del-link' onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __( 'Delete' ) . "</a>
- <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'><p>" . sprintf( __( 'You are about to delete <strong>%s</strong>.' ), $filename ) . "</p>
+ <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'>" .
+ /* translators: %s: file name */
+ '<p>' . sprintf( __( 'You are about to delete %s.' ), '<strong>' . $filename . '</strong>' ) . "</p>
<a href='" . wp_nonce_url( "post.php?action=delete&post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a>
<a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . "</a>
</div>";
continue;
}
- $required = $field['required'] ? '<span class="alignright"><abbr title="required" class="required">*</abbr></span>' : '';
- $aria_required = $field['required'] ? " aria-required='true' " : '';
+ $required = $field['required'] ? '<span class="required">*</span>' : '';
+ $required_attr = $field['required'] ? ' required' : '';
+ $aria_required = $field['required'] ? " aria-required='true'" : '';
$class = $id;
$class .= $field['required'] ? ' form-required' : '';
- $item .= "\t\t<tr class='$class'>\n\t\t\t<th scope='row' class='label'><label for='$name'><span class='alignleft'>{$field['label']}</span>$required<br class='clear' /></label></th>\n\t\t\t<td class='field'>";
+ $item .= "\t\t<tr class='$class'>\n\t\t\t<th scope='row' class='label'><label for='$name'><span class='alignleft'>{$field['label']}{$required}</span><br class='clear' /></label></th>\n\t\t\t<td class='field'>";
if ( !empty( $field[ $field['input'] ] ) )
$item .= $field[ $field['input'] ];
elseif ( $field['input'] == 'textarea' ) {
$field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
}
// Post_excerpt is already escaped by sanitize_post() in get_attachment_fields_to_edit().
- $item .= "<textarea id='$name' name='$name' $aria_required>" . $field['value'] . '</textarea>';
+ $item .= "<textarea id='$name' name='$name'{$required_attr}{$aria_required}>" . $field['value'] . '</textarea>';
} else {
- $item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "' $aria_required />";
+ $item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "'{$required_attr}{$aria_required} />";
}
if ( !empty( $field['helps'] ) )
$item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
}
// 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 )
+ // 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 */
}
$readonly = ! $user_can_edit && ! empty( $field['taxonomy'] ) ? " readonly='readonly' " : '';
- $required = $field['required'] ? '<span class="alignright"><abbr title="required" class="required">*</abbr></span>' : '';
- $aria_required = $field['required'] ? " aria-required='true' " : '';
+ $required = $field['required'] ? '<span class="required">*</span>' : '';
+ $required_attr = $field['required'] ? ' required' : '';
+ $aria_required = $field['required'] ? " aria-required='true'" : '';
$class = 'compat-field-' . $id;
$class .= $field['required'] ? ' form-required' : '';
// sanitize_post() skips the post_content when user_can_richedit.
$field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
}
- $item .= "<textarea id='$id_attr' name='$name' $aria_required>" . $field['value'] . '</textarea>';
+ $item .= "<textarea id='$id_attr' name='$name'{$required_attr}{$aria_required}>" . $field['value'] . '</textarea>';
} else {
- $item .= "<input type='text' class='text' id='$id_attr' name='$name' value='" . esc_attr( $field['value'] ) . "' $readonly $aria_required />";
+ $item .= "<input type='text' class='text' id='$id_attr' name='$name' value='" . esc_attr( $field['value'] ) . "' $readonly{$required_attr}{$aria_required} />";
}
if ( !empty( $field['helps'] ) )
$item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
if ( !empty( $form_fields['_final'] ) )
$item .= "\t\t<tr class='final'><td colspan='2'>{$form_fields['_final']}</td></tr>\n";
- if ( $item )
- $item = '<table class="compat-attachment-fields">' . $item . '</table>';
+
+ if ( $item ) {
+ $item = '<p class="media-types media-types-required-info">' .
+ sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) . '</p>
+ <table class="compat-attachment-fields">' . $item . '</table>';
+ }
foreach ( $hidden_fields as $hidden_field => $value ) {
$item .= '<input type="hidden" name="' . esc_attr( $hidden_field ) . '" value="' . esc_attr( $value ) . '" />' . "\n";
}
/**
- * {@internal Missing Short Description}}
+ * Outputs the legacy media upload header.
*
* @since 2.5.0
*/
}
/**
- * {@internal Missing Short Description}}
+ * Outputs the legacy media upload form.
*
* @since 2.5.0
*
<p id="async-upload-wrap">
<label class="screen-reader-text" for="async-upload"><?php _e('Upload'); ?></label>
<input type="file" name="async-upload" id="async-upload" />
- <?php submit_button( __( 'Upload' ), 'button', 'html-upload', false ); ?>
+ <?php submit_button( __( 'Upload' ), 'primary', 'html-upload', false ); ?>
<a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e('Cancel'); ?></a>
</p>
<div class="clear"></div>
}
/**
- * {@internal Missing Short Description}}
+ * Outputs the legacy media upload form for a given media type.
*
* @since 2.5.0
*
}
/**
- * {@internal Missing Short Description}}
+ * Outputs the legacy media upload form for external media.
*
* @since 2.7.0
*
t.width = t.height = '';
document.getElementById('go_button').style.color = '#bbb';
if ( ! document.forms[0].src.value )
- document.getElementById('status_img').innerHTML = '*';
+ document.getElementById('status_img').innerHTML = '';
else document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/no.png' ) ); ?>" alt="" />';
},
}
/**
- * {@internal Missing Short Description}}
+ * Outputs the legacy media upload form for the media library.
*
* @since 2.5.0
*
return '
<p class="media-types"><label><input type="radio" name="media_type" value="image" id="image-only"' . checked( 'image-only', $view, false ) . ' /> ' . __( 'Image' ) . '</label> <label><input type="radio" name="media_type" value="generic" id="not-image"' . checked( 'not-image', $view, false ) . ' /> ' . __( 'Audio, Video, or Other File' ) . '</label></p>
+ <p class="media-types media-types-required-info">' . sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) . '</p>
<table class="describe ' . $table_class . '"><tbody>
<tr>
<th scope="row" class="label" style="width:130px;">
- <label for="src"><span class="alignleft">' . __('URL') . '</span></label>
- <span class="alignright"><abbr id="status_img" title="required" class="required">*</abbr></span>
+ <label for="src"><span class="alignleft">' . __( 'URL' ) . '</span> <span class="required">*</span></label>
+ <span class="alignright" id="status_img"></span>
</th>
- <td class="field"><input id="src" name="src" value="" type="text" aria-required="true" onblur="addExtImage.getImageData()" /></td>
+ <td class="field"><input id="src" name="src" value="" type="text" required aria-required="true" onblur="addExtImage.getImageData()" /></td>
</tr>
<tr>
<th scope="row" class="label">
- <label for="title"><span class="alignleft">' . __('Title') . '</span></label>
- <span class="alignright"><abbr title="required" class="required">*</abbr></span>
+ <label for="title"><span class="alignleft">' . __( 'Title' ) . '</span> <span class="required">*</span></label>
</th>
- <td class="field"><input id="title" name="title" value="" type="text" aria-required="true" /></td>
+ <td class="field"><input id="title" name="title" value="" type="text" required aria-required="true" /></td>
</tr>
<tr class="not-image"><td></td><td><p class="help">' . __('Link text, e.g. “Ransom Demands (PDF)”') . '</p></td></tr>
* Displays the image and editor in the post editor
*
* @since 3.5.0
+ *
+ * @param WP_Post $post A post object.
*/
function edit_form_image_editor( $post ) {
$open = isset( $_GET['image-editor'] );
$alt_text = get_post_meta( $post->ID, '_wp_attachment_image_alt', true );
$att_url = wp_get_attachment_url( $post->ID ); ?>
- <div class="wp_attachment_holder">
+ <div class="wp_attachment_holder wp-clearfix">
<?php
if ( wp_attachment_is_image( $post->ID ) ) :
$image_edit_button = '';
<div class="imgedit-response" id="imgedit-response-<?php echo $attachment_id; ?>"></div>
- <div<?php if ( $open ) echo ' style="display:none"'; ?> class="wp_attachment_image" id="media-head-<?php echo $attachment_id; ?>">
+ <div<?php if ( $open ) echo ' style="display:none"'; ?> class="wp_attachment_image wp-clearfix" id="media-head-<?php echo $attachment_id; ?>">
<p id="thumbnail-head-<?php echo $attachment_id; ?>"><img class="thumbnail" src="<?php echo set_url_scheme( $thumb_url[0] ); ?>" style="max-width:100%" alt="" /></p>
<p><?php echo $image_edit_button; ?></p>
</div>
);
?>
- <label for="content"><strong><?php _e( 'Description' ); ?></strong><?php
+ <label for="attachment_content"><strong><?php _e( 'Description' ); ?></strong><?php
if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
echo ': ' . __( 'Displayed on attachment pages.' );
} ?></label>
function attachment_submitbox_metadata() {
$post = get_post();
- $filename = esc_html( wp_basename( $post->guid ) );
+ $file = get_attached_file( $post->ID );
+ $filename = esc_html( wp_basename( $file ) );
$media_dims = '';
$meta = wp_get_attachment_metadata( $post->ID );
$att_url = wp_get_attachment_url( $post->ID );
?>
<div class="misc-pub-section misc-pub-attachment">
- <label for="attachment_url"><?php _e( 'File URL:' ); ?></label>
- <input type="text" class="widefat urlfield" readonly="readonly" name="attachment_url" value="<?php echo esc_attr($att_url); ?>" />
+ <label for="attachment_url"><?php _e( 'File URL:' ); ?></label>
+ <input type="text" class="widefat urlfield" readonly="readonly" name="attachment_url" id="attachment_url" value="<?php echo esc_attr( $att_url ); ?>" />
</div>
<div class="misc-pub-section misc-pub-filename">
<?php _e( 'File name:' ); ?> <strong><?php echo $filename; ?></strong>
</div>
<?php
- $file = get_attached_file( $post->ID );
$file_size = false;
if ( isset( $meta['filesize'] ) )
* @return array|bool Returns array of metadata, if found.
*/
function wp_read_video_metadata( $file ) {
- if ( ! file_exists( $file ) )
+ if ( ! file_exists( $file ) ) {
return false;
+ }
$metadata = array();
- if ( ! class_exists( 'getID3' ) )
+ if ( ! defined( 'GETID3_TEMP_DIR' ) ) {
+ define( 'GETID3_TEMP_DIR', get_temp_dir() );
+ }
+
+ if ( ! class_exists( 'getID3', false ) ) {
require( ABSPATH . WPINC . '/ID3/getid3.php' );
+ }
$id3 = new getID3();
$data = $id3->analyze( $file );
* @return array|bool Returns array of metadata, if found.
*/
function wp_read_audio_metadata( $file ) {
- if ( ! file_exists( $file ) )
+ if ( ! file_exists( $file ) ) {
return false;
+ }
$metadata = array();
- if ( ! class_exists( 'getID3' ) )
+ if ( ! defined( 'GETID3_TEMP_DIR' ) ) {
+ define( 'GETID3_TEMP_DIR', get_temp_dir() );
+ }
+
+ if ( ! class_exists( 'getID3', false ) ) {
require( ABSPATH . WPINC . '/ID3/getid3.php' );
+ }
$id3 = new getID3();
$data = $id3->analyze( $file );
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff