";
+ foreach ( $size_names as $size => $label ) {
+ $downsize = image_downsize( $post->ID, $size );
+ $checked = '';
- $html .= "
$label ";
+ // Is this size selectable?
+ $enabled = ( $downsize[3] || 'full' == $size );
+ $css_id = "image-size-{$size}-{$post->ID}";
- // Only show the dimensions if that choice is available.
- if ( $enabled )
- $html .= "
" . sprintf( "(%d × %d)", $downsize[1], $downsize[2] ). " ";
+ // If this size is the default but that's not available, don't select it.
+ if ( $size == $check ) {
+ if ( $enabled ) {
+ $checked = " checked='checked'";
+ } else {
+ $check = '';
+ }
+ } elseif ( ! $check && $enabled && 'thumbnail' != $size ) {
+ /*
+ * If $check is not enabled, default to the first available size
+ * that's bigger than a thumbnail.
+ */
+ $check = $size;
+ $checked = " checked='checked'";
+ }
+
+ $html = "
';
+ $html .= "
$label ";
- $out[] = $html;
+ // Only show the dimensions if that choice is available.
+ if ( $enabled ) {
+ $html .= "
" . sprintf( "(%d × %d)", $downsize[1], $downsize[2] ). " ";
}
+ $html .= '
' . 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.'), 'http://apps.wordpress.org/' ) . '
';
+ 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;
}
@@ -1780,6 +1812,14 @@ $plupload_init = array(
'multipart_params' => $post_params,
);
+// Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos
+// when enabled. See #29602.
+if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
+ strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false ) {
+
+ $plupload_init['multi_selection'] = false;
+}
+
/**
* Filter the default Plupload settings.
*
@@ -1802,7 +1842,7 @@ if( !$large_size_w )
$large_size_w = 1024;
?>
var resize_height = , resize_width = ,
-wpUploaderInit = ;
+wpUploaderInit = ;
@@ -1912,7 +1952,6 @@ function media_upload_type_form($type = 'file', $errors = null, $id = null) {
@@ -2269,7 +2304,7 @@ function media_upload_library_form($errors) {
?>
-
post_mime_type, 'audio/' ) ):
+ elseif ( $attachment_id && wp_attachment_is( 'audio', $post ) ):
wp_maybe_generate_attachment_metadata( $post );
echo wp_audio_shortcode( array( 'src' => $att_url ) );
- elseif ( $attachment_id && 0 === strpos( $post->post_mime_type, 'video/' ) ):
+ elseif ( $attachment_id && wp_attachment_is( 'video', $post ) ):
wp_maybe_generate_attachment_metadata( $post );
@@ -2860,7 +2895,7 @@ function wp_add_id3_tag_data( &$metadata, $data ) {
foreach ( array( 'id3v2', 'id3v1' ) as $version ) {
if ( ! empty( $data[$version]['comments'] ) ) {
foreach ( $data[$version]['comments'] as $key => $list ) {
- if ( ! empty( $list ) ) {
+ if ( 'length' !== $key && ! empty( $list ) ) {
$metadata[$key] = reset( $list );
// Fix bug in byte stream analysis.
if ( 'terms_of_use' === $key && 0 === strpos( $metadata[$key], 'yright notice.' ) )
@@ -2898,7 +2933,7 @@ function wp_add_id3_tag_data( &$metadata, $data ) {
* @since 3.6.0
*
* @param string $file Path to file.
- * @return array|boolean Returns array of metadata, if found.
+ * @return array|bool Returns array of metadata, if found.
*/
function wp_read_video_metadata( $file ) {
if ( ! file_exists( $file ) )
@@ -2922,7 +2957,7 @@ function wp_read_video_metadata( $file ) {
if ( ! empty( $data['mime_type'] ) )
$metadata['mime_type'] = $data['mime_type'];
if ( ! empty( $data['playtime_seconds'] ) )
- $metadata['length'] = (int) ceil( $data['playtime_seconds'] );
+ $metadata['length'] = (int) round( $data['playtime_seconds'] );
if ( ! empty( $data['playtime_string'] ) )
$metadata['length_formatted'] = $data['playtime_string'];
if ( ! empty( $data['video']['resolution_x'] ) )
@@ -2978,7 +3013,7 @@ function wp_read_audio_metadata( $file ) {
if ( ! empty( $data['mime_type'] ) )
$metadata['mime_type'] = $data['mime_type'];
if ( ! empty( $data['playtime_seconds'] ) )
- $metadata['length'] = (int) ceil( $data['playtime_seconds'] );
+ $metadata['length'] = (int) round( $data['playtime_seconds'] );
if ( ! empty( $data['playtime_string'] ) )
$metadata['length_formatted'] = $data['playtime_string'];
@@ -2986,3 +3021,63 @@ function wp_read_audio_metadata( $file ) {
return $metadata;
}
+
+/**
+ * Encapsulate logic for Attach/Detach actions
+ *
+ * @since 4.2.0
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param int $parent_id Attachment parent ID.
+ * @param string $action Optional. Attach/detach action. Accepts 'attach' or 'detach'.
+ * Default 'attach'.
+ */
+function wp_media_attach_action( $parent_id, $action = 'attach' ) {
+ global $wpdb;
+
+ if ( ! $parent_id ) {
+ return;
+ }
+
+ if ( ! current_user_can( 'edit_post', $parent_id ) ) {
+ wp_die( __( 'You are not allowed to edit this post.' ) );
+ }
+ $ids = array();
+ foreach ( (array) $_REQUEST['media'] as $att_id ) {
+ $att_id = (int) $att_id;
+
+ if ( ! current_user_can( 'edit_post', $att_id ) ) {
+ continue;
+ }
+
+ $ids[] = $att_id;
+ }
+
+ if ( ! empty( $ids ) ) {
+ $ids_string = implode( ',', $ids );
+ if ( 'attach' === $action ) {
+ $result = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ( $ids_string )", $parent_id ) );
+ } else {
+ $result = $wpdb->query( "UPDATE $wpdb->posts SET post_parent = 0 WHERE post_type = 'attachment' AND ID IN ( $ids_string )" );
+ }
+
+ foreach ( $ids as $att_id ) {
+ clean_attachment_cache( $att_id );
+ }
+ }
+
+ if ( isset( $result ) ) {
+ $location = 'upload.php';
+ if ( $referer = wp_get_referer() ) {
+ if ( false !== strpos( $referer, 'upload.php' ) ) {
+ $location = remove_query_arg( array( 'attached', 'detach' ), $referer );
+ }
+ }
+
+ $key = 'attach' === $action ? 'attached' : 'detach';
+ $location = add_query_arg( array( $key => $result ), $location );
+ wp_redirect( $location );
+ exit;
+ }
+}