Wordpress 3.5.2-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / media.php

diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 7e27ded13399e4d837adeb0b3a041be4dacfb62d..3938943a1e75a1d7adf83a7e561f828869bb5fbd 100644 (file)
--- 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
  *
  *
  * @since 2.5.0
  *

- * @return unknown
+ * @return array default tabs

  */
 function media_upload_tabs() {
        $_default_tabs = array(
  */
 function media_upload_tabs() {
        $_default_tabs = array(


@@ -25,12 +25,12 @@ function media_upload_tabs() {
 }
 
 /**
 }
 
 /**

- * {@internal Missing Short Description}}
+ * Adds the gallery tab back to the tabs array if post has image attachments

  *
  * @since 2.5.0
  *
  *
  * @since 2.5.0
  *

- * @param unknown_type $tabs
- * @return unknown
+ * @param array $tabs
+ * @return array $tabs with gallery if post has image attachment

  */
 function update_gallery_tab($tabs) {
        global $wpdb;
  */
 function update_gallery_tab($tabs) {
        global $wpdb;


@@ -64,6 +64,7 @@ add_filter('media_upload_tabs', 'update_gallery_tab');
 function the_media_upload_tabs() {
        global $redir_tab;
        $tabs = media_upload_tabs();
 function the_media_upload_tabs() {
        global $redir_tab;
        $tabs = media_upload_tabs();

+       $default = 'type';

 
        if ( !empty($tabs) ) {
                echo "<ul id='sidemenu'>\n";
 
        if ( !empty($tabs) ) {
                echo "<ul id='sidemenu'>\n";


@@ -72,13 +73,15 @@ function the_media_upload_tabs() {
                elseif ( isset($_GET['tab']) && array_key_exists($_GET['tab'], $tabs) )
                        $current = $_GET['tab'];
                else
                elseif ( isset($_GET['tab']) && array_key_exists($_GET['tab'], $tabs) )
                        $current = $_GET['tab'];
                else

-                       $current = apply_filters('media_upload_default_tab', 'type');
+                       $current = apply_filters('media_upload_default_tab', $default);

 
                foreach ( $tabs as $callback => $text ) {
                        $class = '';
 
                foreach ( $tabs as $callback => $text ) {
                        $class = '';

+

                        if ( $current == $callback )
                                $class = " class='current'";
                        if ( $current == $callback )
                                $class = " class='current'";

-                       $href = add_query_arg(array('tab'=>$callback, 's'=>false, 'paged'=>false, 'post_mime_type'=>false, 'm'=>false));
+
+                       $href = add_query_arg(array('tab' => $callback, 's' => false, 'paged' => false, 'post_mime_type' => false, 'm' => false));

                        $link = "<a href='" . esc_url($href) . "'$class>$text</a>";
                        echo "\t<li id='" . esc_attr("tab-$callback") . "'>$link</li>\n";
                }
                        $link = "<a href='" . esc_url($href) . "'$class>$text</a>";
                        echo "\t<li id='" . esc_attr("tab-$callback") . "'>$link</li>\n";
                }


@@ -91,18 +94,19 @@ function the_media_upload_tabs() {
  *
  * @since 2.5.0
  *
  *
  * @since 2.5.0
  *

- * @param unknown_type $id
- * @param unknown_type $alt
- * @param unknown_type $title
- * @param unknown_type $align
- * @param unknown_type $url
- * @param unknown_type $rel
- * @param unknown_type $size
- * @return unknown
+ * @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

  */
 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, $title, $align, $size);
+       $html = get_image_tag($id, $alt, '', $align, $size);

 
        $rel = $rel ? ' rel="attachment wp-att-' . esc_attr($id).'"' : '';
 
 
        $rel = $rel ? ' rel="attachment wp-att-' . esc_attr($id).'"' : '';
 


@@ -115,18 +119,19 @@ function get_image_send_to_editor($id, $caption, $title, $align, $url='', $rel =
 }
 
 /**
 }
 
 /**

- * {@internal Missing Short Description}}
+ * Adds image shortcode with caption to editor

  *
  * @since 2.6.0
  *
  *
  * @since 2.6.0
  *

- * @param unknown_type $html
- * @param unknown_type $id
- * @param unknown_type $alt
- * @param unknown_type $title
- * @param unknown_type $align
- * @param unknown_type $url
- * @param unknown_type $size
- * @return unknown
+ * @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() )
+ * @return string

  */
 function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $alt = '' ) {
 
  */
 function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $alt = '' ) {
 


@@ -135,33 +140,43 @@ function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $
 
        $id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
 
 
        $id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
 

-       if ( ! preg_match( '/width="([0-9]+)/', $html, $matches ) )
+       if ( ! preg_match( '/width=["\']([0-9]+)/', $html, $matches ) )

                return $html;
 
        $width = $matches[1];
 
                return $html;
 
        $width = $matches[1];
 

-       $caption = str_replace( array( '>',    '<',    '"',      "'" ),
-                                                       array( '&gt;', '&lt;', '&quot;', '&#039;' ),
-                                                       $caption
-                                                 );
+       $caption = str_replace( array("\r\n", "\r"), "\n", $caption);
+       $caption = preg_replace_callback( '/<[a-zA-Z0-9]+(?: [^<>]+>)*/', '_cleanup_image_add_caption', $caption );
+       // convert any remaining line breaks to <br>
+       $caption = preg_replace( '/[ \n\t]*\n[ \t]*/', '<br />', $caption );

 
        $html = preg_replace( '/(class=["\'][^\'"]*)align(none|left|right|center)\s?/', '$1', $html );
        if ( empty($align) )
                $align = 'none';
 
 
        $html = preg_replace( '/(class=["\'][^\'"]*)align(none|left|right|center)\s?/', '$1', $html );
        if ( empty($align) )
                $align = 'none';
 

-       $shcode = '[caption id="' . $id . '" align="align' . $align
-       . '" width="' . $width . '" caption="' . addslashes($caption) . '"]' . $html . '[/caption]';
+       $shcode = '[caption id="' . $id . '" align="align' . $align     . '" width="' . $width . '"]' . $html . ' ' . $caption . '[/caption]';

 
        return apply_filters( 'image_add_caption_shortcode', $shcode, $html );
 }
 add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 );
 
 /**
 
        return apply_filters( 'image_add_caption_shortcode', $shcode, $html );
 }
 add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 );
 
 /**

- * {@internal Missing Short Description}}
+ * Private preg_replace callback used in image_add_caption()
+ *
+ * @access private
+ * @since 3.4.0
+ */
+function _cleanup_image_add_caption( $matches ) {
+       // remove any line breaks from inside the tags
+       return preg_replace( '/[\r\n\t]+/', ' ', $matches[0] );
+}
+
+/**
+ * Adds image html to editor

  *
  * @since 2.5.0
  *
  *
  * @since 2.5.0
  *

- * @param unknown_type $html
+ * @param string $html

  */
 function media_send_to_editor($html) {
 ?>
  */
 function media_send_to_editor($html) {
 ?>


@@ -176,8 +191,6 @@ win.send_to_editor('<?php echo addslashes($html); ?>');
 }
 
 /**
 }
 
 /**

- * {@internal Missing Short Description}}
- *

  * This handles the file upload POST itself, creating the attachment post.
  *
  * @since 2.5.0
  * This handles the file upload POST itself, creating the attachment post.
  *
  * @since 2.5.0


@@ -228,6 +241,10 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override
                'post_content' => $content,
        ), $post_data );
 
                'post_content' => $content,
        ), $post_data );
 

+       // This should never be set as it would then overwrite an existing attachment.
+       if ( isset( $attachment['ID'] ) )
+               unset( $attachment['ID'] );
+

        // Save the data
        $id = wp_insert_attachment($attachment, $file, $post_id);
        if ( !is_wp_error($id) ) {
        // Save the data
        $id = wp_insert_attachment($attachment, $file, $post_id);
        if ( !is_wp_error($id) ) {


@@ -252,7 +269,13 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override
 function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = array()) {
        $overrides = array('test_form'=>false);
 
 function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = array()) {
        $overrides = array('test_form'=>false);
 

-       $file = wp_handle_sideload($file_array, $overrides);
+       $time = current_time( 'mysql' );
+       if ( $post = get_post( $post_id ) ) {
+               if ( substr( $post->post_date, 0, 4 ) > 0 )
+                       $time = $post->post_date;
+       }
+
+       $file = wp_handle_sideload( $file_array, $overrides, $time );

        if ( isset($file['error']) )
                return new WP_Error( 'upload_error', $file['error'] );
 
        if ( isset($file['error']) )
                return new WP_Error( 'upload_error', $file['error'] );
 


@@ -270,7 +293,8 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data =
                        $content = $image_meta['caption'];
        }
 
                        $content = $image_meta['caption'];
        }
 

-       $title = isset($desc) ? $desc : '';
+       if ( isset( $desc ) )
+               $title = $desc;

 
        // Construct the attachment array
        $attachment = array_merge( array(
 
        // Construct the attachment array
        $attachment = array_merge( array(


@@ -281,6 +305,10 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data =
                'post_content' => $content,
        ), $post_data );
 
                'post_content' => $content,
        ), $post_data );
 

+       // This should never be set as it would then overwrite an existing attachment.
+       if ( isset( $attachment['ID'] ) )
+               unset( $attachment['ID'] );
+

        // Save the attachment metadata
        $id = wp_insert_attachment($attachment, $file, $post_id);
        if ( !is_wp_error($id) )
        // Save the attachment metadata
        $id = wp_insert_attachment($attachment, $file, $post_id);
        if ( !is_wp_error($id) )


@@ -290,25 +318,18 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data =
 }
 
 /**
 }
 
 /**

- * {@internal Missing Short Description}}
- *
- * Wrap iframe content (produced by $content_func) in a doctype, html head/body
- * etc any additional function args will be passed to content_func.
+ * Adds the iframe to display content for the media upload page

  *
  * @since 2.5.0
  *
  *
  * @since 2.5.0
  *

- * @param unknown_type $content_func
+ * @param array $content_func

  */
 function wp_iframe($content_func /* ... */) {
  */
 function wp_iframe($content_func /* ... */) {

+       _wp_admin_html_begin();

 ?>
 ?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
-<head>
-<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />

 <title><?php bloginfo('name') ?> &rsaquo; <?php _e('Uploads'); ?> &#8212; <?php _e('WordPress'); ?></title>
 <?php
 <title><?php bloginfo('name') ?> &rsaquo; <?php _e('Uploads'); ?> &#8212; <?php _e('WordPress'); ?></title>
 <?php

-wp_enqueue_style( 'global' );
-wp_enqueue_style( 'wp-admin' );
+

 wp_enqueue_style( 'colors' );
 // Check callback name for 'media'
 if ( ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) )
 wp_enqueue_style( 'colors' );
 // Check callback name for 'media'
 if ( ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) )


@@ -320,7 +341,7 @@ wp_enqueue_style( 'ie' );
 //<![CDATA[
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
 var userSettings = {'url':'<?php echo SITECOOKIEPATH; ?>','uid':'<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>','time':'<?php echo time(); ?>'};
 //<![CDATA[
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
 var userSettings = {'url':'<?php echo SITECOOKIEPATH; ?>','uid':'<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>','time':'<?php echo time(); ?>'};

-var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
+var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',

 isRtl = <?php echo (int) is_rtl(); ?>;
 //]]>
 </script>
 isRtl = <?php echo (int) is_rtl(); ?>;
 //]]>
 </script>


@@ -337,7 +358,10 @@ if ( is_string($content_func) )
        do_action( "admin_head_{$content_func}" );
 ?>
 </head>
        do_action( "admin_head_{$content_func}" );
 ?>
 </head>

-<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?>>
+<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-core-ui no-js">
+<script type="text/javascript">
+document.body.className = document.body.className.replace('no-js', 'js');
+</script>

 <?php
        $args = func_get_args();
        $args = array_slice($args, 1);
 <?php
        $args = func_get_args();
        $args = array_slice($args, 1);


@@ -352,49 +376,51 @@ if ( is_string($content_func) )
 }
 
 /**
 }
 
 /**

- * {@internal Missing Short Description}}
+ * Adds the media button to the editor

  *
  * @since 2.5.0
  *
  * @since 2.5.0

+ *
+ * @param string $editor_id

  */
  */

-function media_buttons() {
-       $do_image = $do_audio = $do_video = true;
-       if ( is_multisite() ) {
-               $media_buttons = get_site_option( 'mu_media_buttons' );
-               if ( empty($media_buttons['image']) )
-                       $do_image = false;
-               if ( empty($media_buttons['audio']) )
-                       $do_audio = false;
-               if ( empty($media_buttons['video']) )
-                       $do_video = false;
-       }
-       $out = '';
+function media_buttons($editor_id = 'content') {
+       $post = get_post();
+       if ( ! $post && ! empty( $GLOBALS['post_ID'] ) )
+               $post = $GLOBALS['post_ID'];

 
 

-       if ( $do_image )
-               $out .= _media_button(__('Add an Image'), 'images/media-button-image.gif?ver=20100531', 'image');
-       if ( $do_video )
-               $out .= _media_button(__('Add Video'), 'images/media-button-video.gif?ver=20100531', 'video');
-       if ( $do_audio )
-               $out .= _media_button(__('Add Audio'), 'images/media-button-music.gif?ver=20100531', 'audio');
+       wp_enqueue_media( array(
+               'post' => $post
+       ) );

 
 

-       $out .= _media_button(__('Add Media'), 'images/media-button-other.gif?ver=20100531', 'media');
+       $img = '<span class="wp-media-buttons-icon"></span> ';

 
 

-       $context = apply_filters('media_buttons_context', __('Upload/Insert %s'));
+       echo '<a href="#" class="button insert-media add_media" data-editor="' . esc_attr( $editor_id ) . '" title="' . esc_attr__( 'Add Media' ) . '">' . $img . __( 'Add Media' ) . '</a>';

 
 

-       printf($context, $out);
+       // Don't use this filter. Want to add a button? Use the media_buttons action.
+       $legacy_filter = apply_filters('media_buttons_context', ''); // deprecated
+
+       if ( $legacy_filter ) {
+               // #WP22559. Close <a> if a plugin started by closing <a> to open their own <a> tag.
+               if ( 0 === stripos( trim( $legacy_filter ), '</a>' ) )
+                       $legacy_filter .= '</a>';
+               echo $legacy_filter;
+       }

 }
 add_action( 'media_buttons', 'media_buttons' );
 
 }
 add_action( 'media_buttons', 'media_buttons' );
 

-function _media_button($title, $icon, $type) {
-       return "<a href='" . esc_url( get_upload_iframe_src($type) ) . "' id='add_$type' class='thickbox' title='$title'><img src='" . esc_url( admin_url( $icon ) ) . "' alt='$title' onclick='return false;' /></a>";
-}
+function get_upload_iframe_src( $type = null, $post_id = null, $tab = null ) {
+       global $post_ID;
+
+       if ( empty( $post_id ) )
+               $post_id = $post_ID;

 
 

-function get_upload_iframe_src($type) {
-       global $post_ID, $temp_ID;
-       $uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID);
-       $upload_iframe_src = add_query_arg('post_id', $uploading_iframe_ID, 'media-upload.php');
+       $upload_iframe_src = add_query_arg( 'post_id', (int) $post_id, admin_url('media-upload.php') );

 
 

-       if ( 'media' != $type )
+       if ( $type && 'media' != $type )

                $upload_iframe_src = add_query_arg('type', $type, $upload_iframe_src);
                $upload_iframe_src = add_query_arg('type', $type, $upload_iframe_src);

+
+       if ( ! empty( $tab ) )
+               $upload_iframe_src = add_query_arg('tab', $tab, $upload_iframe_src);
+

        $upload_iframe_src = apply_filters($type . '_upload_iframe_src', $upload_iframe_src);
 
        return add_query_arg('TB_iframe', true, $upload_iframe_src);
        $upload_iframe_src = apply_filters($type . '_upload_iframe_src', $upload_iframe_src);
 
        return add_query_arg('TB_iframe', true, $upload_iframe_src);


@@ -405,7 +431,7 @@ function get_upload_iframe_src($type) {
  *
  * @since 2.5.0
  *
  *
  * @since 2.5.0
  *

- * @return unknown
+ * @return mixed void|object WP_Error on failure

  */
 function media_upload_form_handler() {
        check_admin_referer('media-form');
  */
 function media_upload_form_handler() {
        check_admin_referer('media-form');


@@ -419,6 +445,11 @@ function media_upload_form_handler() {
 
        if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
                $post = $_post = get_post($attachment_id, ARRAY_A);
 
        if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
                $post = $_post = get_post($attachment_id, ARRAY_A);

+               $post_type_object = get_post_type_object( $post[ 'post_type' ] );
+
+               if ( !current_user_can( $post_type_object->cap->edit_post, $attachment_id ) )
+                       continue;
+

                if ( isset($attachment['post_content']) )
                        $post['post_content'] = $attachment['post_content'];
                if ( isset($attachment['post_title']) )
                if ( isset($attachment['post_content']) )
                        $post['post_content'] = $attachment['post_content'];
                if ( isset($attachment['post_title']) )


@@ -472,7 +503,7 @@ function media_upload_form_handler() {
        if ( isset($send_id) ) {
                $attachment = stripslashes_deep( $_POST['attachments'][$send_id] );
 
        if ( isset($send_id) ) {
                $attachment = stripslashes_deep( $_POST['attachments'][$send_id] );
 

-               $html = $attachment['post_title'];
+               $html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';

                if ( !empty($attachment['url']) ) {
                        $rel = '';
                        if ( strpos($attachment['url'], 'attachment_id') || get_attachment_link($send_id) == $attachment['url'] )
                if ( !empty($attachment['url']) ) {
                        $rel = '';
                        if ( strpos($attachment['url'], 'attachment_id') || get_attachment_link($send_id) == $attachment['url'] )


@@ -492,9 +523,9 @@ function media_upload_form_handler() {
  *
  * @since 2.5.0
  *
  *
  * @since 2.5.0
  *

- * @return unknown
+ * @return mixed

  */
  */

-function media_upload_image() {
+function wp_media_upload_handler() {

        $errors = array();
        $id = 0;
 
        $errors = array();
        $id = 0;
 


@@ -510,20 +541,37 @@ function media_upload_image() {
        }
 
        if ( !empty($_POST['insertonlybutton']) ) {
        }
 
        if ( !empty($_POST['insertonlybutton']) ) {

-               $alt = $align = '';
-
-               $src = $_POST['insertonly']['src'];
+               $src = $_POST['src'];

                if ( !empty($src) && !strpos($src, '://') )
                        $src = "http://$src";
                if ( !empty($src) && !strpos($src, '://') )
                        $src = "http://$src";

-               $alt = esc_attr($_POST['insertonly']['alt']);
-               if ( isset($_POST['insertonly']['align']) ) {
-                       $align = esc_attr($_POST['insertonly']['align']);
-                       $class = " class='align$align'";
+
+               if ( isset( $_POST['media_type'] ) && 'image' != $_POST['media_type'] ) {
+                       $title = esc_html( stripslashes( $_POST['title'] ) );
+                       if ( empty( $title ) )
+                               $title = esc_html( basename( $src ) );
+
+                       if ( $title && $src )
+                               $html = "<a href='" . esc_url($src) . "'>$title</a>";
+
+                       $type = 'file';
+                       if ( ( $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src ) ) && ( $ext_type = wp_ext2type( $ext ) )
+                               && ( 'audio' == $ext_type || 'video' == $ext_type ) )
+                                       $type = $ext_type;
+
+                       $html = apply_filters( $type . '_send_to_editor_url', $html, esc_url_raw( $src ), $title );
+               } else {
+                       $align = '';
+                       $alt = esc_attr( stripslashes( $_POST['alt'] ) );
+                       if ( isset($_POST['align']) ) {
+                               $align = esc_attr( stripslashes( $_POST['align'] ) );
+                               $class = " class='align$align'";
+                       }
+                       if ( !empty($src) )
+                               $html = "<img src='" . esc_url($src) . "' alt='$alt'$class />";
+
+                       $html = apply_filters( 'image_send_to_editor_url', $html, esc_url_raw( $src ), $alt, $align );

                }
                }

-               if ( !empty($src) )
-                       $html = "<img src='" . esc_url($src) . "' alt='$alt'$class />";

 
 

-               $html = apply_filters('image_send_to_editor_url', $html, esc_url_raw($src), $alt, $align);

                return media_send_to_editor($html);
        }
 
                return media_send_to_editor($html);
        }
 


@@ -541,8 +589,12 @@ function media_upload_image() {
                return media_upload_gallery();
        }
 
                return media_upload_gallery();
        }
 

-       if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' )
-               return wp_iframe( 'media_upload_type_url_form', 'image', $errors, $id );
+       if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) {
+               $type = 'image';
+               if ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ) ) )
+                       $type = $_GET['type'];
+               return wp_iframe( 'media_upload_type_url_form', $type, $errors, $id );
+       }

 
        return wp_iframe( 'media_upload_type_form', 'image', $errors, $id );
 }
 
        return wp_iframe( 'media_upload_type_form', 'image', $errors, $id );
 }


@@ -564,7 +616,7 @@ function media_sideload_image($file, $post_id, $desc = null) {
 
                // Set variables for storage
                // fix file filename for query strings
 
                // Set variables for storage
                // fix file filename for query strings

-               preg_match('/[^\?]+\.(jpg|JPG|jpe|JPE|jpeg|JPEG|gif|GIF|png|PNG)/', $file, $matches);
+               preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches );

                $file_array['name'] = basename($matches[0]);
                $file_array['tmp_name'] = $tmp;
 
                $file_array['name'] = basename($matches[0]);
                $file_array['tmp_name'] = $tmp;
 


@@ -593,180 +645,6 @@ function media_sideload_image($file, $post_id, $desc = null) {
        }
 }
 
        }
 }
 

-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.5.0
- *
- * @return unknown
- */
-function media_upload_audio() {
-       $errors = array();
-       $id = 0;
-
-       if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
-               check_admin_referer('media-form');
-               // Upload File button was clicked
-               $id = media_handle_upload('async-upload', $_REQUEST['post_id']);
-               unset($_FILES);
-               if ( is_wp_error($id) ) {
-                       $errors['upload_error'] = $id;
-                       $id = false;
-               }
-       }
-
-       if ( !empty($_POST['insertonlybutton']) ) {
-               $href = $_POST['insertonly']['href'];
-               if ( !empty($href) && !strpos($href, '://') )
-                       $href = "http://$href";
-
-               $title = esc_attr($_POST['insertonly']['title']);
-               if ( empty($title) )
-            $title = esc_attr( basename($href) );
-
-               if ( !empty($title) && !empty($href) )
-            $html = "<a href='" . esc_url($href) . "' >$title</a>";
-
-               $html = apply_filters('audio_send_to_editor_url', $html, $href, $title);
-
-               return media_send_to_editor($html);
-       }
-
-       if ( !empty($_POST) ) {
-               $return = media_upload_form_handler();
-
-               if ( is_string($return) )
-                       return $return;
-               if ( is_array($return) )
-                       $errors = $return;
-       }
-
-       if ( isset($_POST['save']) ) {
-               $errors['upload_notice'] = __('Saved.');
-               return media_upload_gallery();
-       }
-
-       if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' )
-               return wp_iframe( 'media_upload_type_url_form', 'audio', $errors, $id );
-
-       return wp_iframe( 'media_upload_type_form', 'audio', $errors, $id );
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.5.0
- *
- * @return unknown
- */
-function media_upload_video() {
-       $errors = array();
-       $id = 0;
-
-       if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
-               check_admin_referer('media-form');
-               // Upload File button was clicked
-               $id = media_handle_upload('async-upload', $_REQUEST['post_id']);
-               unset($_FILES);
-               if ( is_wp_error($id) ) {
-                       $errors['upload_error'] = $id;
-                       $id = false;
-               }
-       }
-
-       if ( !empty($_POST['insertonlybutton']) ) {
-               $href = $_POST['insertonly']['href'];
-               if ( !empty($href) && !strpos($href, '://') )
-                       $href = "http://$href";
-
-               $title = esc_attr($_POST['insertonly']['title']);
-        if ( empty($title) )
-            $title = esc_attr( basename($href) );
-
-               if ( !empty($title) && !empty($href) )
-            $html = "<a href='" . esc_url($href) . "' >$title</a>";
-
-               $html = apply_filters('video_send_to_editor_url', $html, $href, $title);
-
-               return media_send_to_editor($html);
-       }
-
-       if ( !empty($_POST) ) {
-               $return = media_upload_form_handler();
-
-               if ( is_string($return) )
-                       return $return;
-               if ( is_array($return) )
-                       $errors = $return;
-       }
-
-       if ( isset($_POST['save']) ) {
-               $errors['upload_notice'] = __('Saved.');
-               return media_upload_gallery();
-       }
-
-       if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' )
-               return wp_iframe( 'media_upload_type_url_form', 'video', $errors, $id );
-
-       return wp_iframe( 'media_upload_type_form', 'video', $errors, $id );
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.5.0
- *
- * @return unknown
- */
-function media_upload_file() {
-       $errors = array();
-       $id = 0;
-
-       if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
-               check_admin_referer('media-form');
-               // Upload File button was clicked
-               $id = media_handle_upload('async-upload', $_REQUEST['post_id']);
-               unset($_FILES);
-               if ( is_wp_error($id) ) {
-                       $errors['upload_error'] = $id;
-                       $id = false;
-               }
-       }
-
-       if ( !empty($_POST['insertonlybutton']) ) {
-               $href = $_POST['insertonly']['href'];
-               if ( !empty($href) && !strpos($href, '://') )
-                       $href = "http://$href";
-
-               $title = esc_attr($_POST['insertonly']['title']);
-               if ( empty($title) )
-                       $title = basename($href);
-               if ( !empty($title) && !empty($href) )
-                       $html = "<a href='" . esc_url($href) . "' >$title</a>";
-               $html = apply_filters('file_send_to_editor_url', $html, esc_url_raw($href), $title);
-               return media_send_to_editor($html);
-       }
-
-       if ( !empty($_POST) ) {
-               $return = media_upload_form_handler();
-
-               if ( is_string($return) )
-                       return $return;
-               if ( is_array($return) )
-                       $errors = $return;
-       }
-
-       if ( isset($_POST['save']) ) {
-               $errors['upload_notice'] = __('Saved.');
-               return media_upload_gallery();
-       }
-
-       if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' )
-               return wp_iframe( 'media_upload_type_url_form', 'file', $errors, $id );
-
-       return wp_iframe( 'media_upload_type_form', 'file', $errors, $id );
-}
-

 /**
  * {@internal Missing Short Description}}
  *
 /**
  * {@internal Missing Short Description}}
  *


@@ -816,9 +694,9 @@ function media_upload_library() {
  *
  * @since 2.7.0
  *
  *
  * @since 2.7.0
  *

- * @param unknown_type $post
- * @param unknown_type $checked
- * @return unknown
+ * @param object $post
+ * @param string $checked
+ * @return string

  */
 function image_align_input_fields( $post, $checked = '' ) {
 
  */
 function image_align_input_fields( $post, $checked = '' ) {
 


@@ -844,14 +722,14 @@ function image_align_input_fields( $post, $checked = '' ) {
  *
  * @since 2.7.0
  *
  *
  * @since 2.7.0
  *

- * @param unknown_type $post
- * @param unknown_type $check
- * @return unknown
+ * @param object $post
+ * @param bool|string $check
+ * @return array

  */
 function image_size_input_fields( $post, $check = '' ) {
 
                // get a list of the actual pixel dimensions of each possible intermediate version of this image
  */
 function image_size_input_fields( $post, $check = '' ) {
 
                // get a list of the actual pixel dimensions of each possible intermediate version of this image

-               $size_names = array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full Size'));
+               $size_names = apply_filters( 'image_size_names_choose', array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full Size')) );

 
                if ( empty($check) )
                        $check = get_user_setting('imgsize', 'medium');
 
                if ( empty($check) )
                        $check = get_user_setting('imgsize', 'medium');


@@ -899,9 +777,9 @@ function image_size_input_fields( $post, $check = '' ) {
  *
  * @since 2.7.0
  *
  *
  * @since 2.7.0
  *

- * @param unknown_type $post
- * @param unknown_type $url_type
- * @return unknown
+ * @param object $post
+ * @param string $url_type
+ * @return string

  */
 function image_link_input_fields($post, $url_type = '') {
 
  */
 function image_link_input_fields($post, $url_type = '') {
 


@@ -919,59 +797,40 @@ function image_link_input_fields($post, $url_type = '') {
 
        return "
        <input type='text' class='text urlfield' name='attachments[$post->ID][url]' value='" . esc_attr($url) . "' /><br />
 
        return "
        <input type='text' class='text urlfield' name='attachments[$post->ID][url]' value='" . esc_attr($url) . "' /><br />

-       <button type='button' class='button urlnone' title=''>" . __('None') . "</button>
-       <button type='button' class='button urlfile' title='" . esc_attr($file) . "'>" . __('File URL') . "</button>
-       <button type='button' class='button urlpost' title='" . esc_attr($link) . "'>" . __('Post URL') . "</button>
+       <button type='button' class='button urlnone' data-link-url=''>" . __('None') . "</button>
+       <button type='button' class='button urlfile' data-link-url='" . esc_attr($file) . "'>" . __('File URL') . "</button>
+       <button type='button' class='button urlpost' data-link-url='" . esc_attr($link) . "'>" . __('Attachment Post URL') . "</button>

 ";
 }
 
 ";
 }
 

+function wp_caption_input_textarea($edit_post) {
+       // post data is already escaped
+       $name = "attachments[{$edit_post->ID}][post_excerpt]";
+
+       return '<textarea name="' . $name . '" id="' . $name . '">' . $edit_post->post_excerpt . '</textarea>';
+}
+

 /**
  * {@internal Missing Short Description}}
  *
  * @since 2.5.0
  *
 /**
  * {@internal Missing Short Description}}
  *
  * @since 2.5.0
  *

- * @param unknown_type $form_fields
- * @param unknown_type $post
- * @return unknown
+ * @param array $form_fields
+ * @param object $post
+ * @return array

  */
 function image_attachment_fields_to_edit($form_fields, $post) {
  */
 function image_attachment_fields_to_edit($form_fields, $post) {

-       if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
-               $alt = get_post_meta($post->ID, '_wp_attachment_image_alt', true);
-               if ( empty($alt) )
-                       $alt = '';
-
-               $form_fields['post_title']['required'] = true;
-
-               $form_fields['image_alt'] = array(
-                       'value' => $alt,
-                       'label' => __('Alternate Text'),
-                       'helps' => __('Alt text for the image, e.g. &#8220;The Mona Lisa&#8221;')
-               );
-
-               $form_fields['align'] = array(
-                       'label' => __('Alignment'),
-                       'input' => 'html',
-                       'html'  => image_align_input_fields($post, get_option('image_default_align')),
-               );
-
-               $form_fields['image-size'] = image_size_input_fields( $post, get_option('image_default_size', 'medium') );
-
-       } else {
-               unset( $form_fields['image_alt'] );
-       }

        return $form_fields;
 }
 
        return $form_fields;
 }
 

-add_filter('attachment_fields_to_edit', 'image_attachment_fields_to_edit', 10, 2);
-

 /**
  * {@internal Missing Short Description}}
  *
  * @since 2.5.0
  *
 /**
  * {@internal Missing Short Description}}
  *
  * @since 2.5.0
  *

- * @param unknown_type $form_fields
- * @param unknown_type $post
- * @return unknown
+ * @param array $form_fields
+ * @param object $post {@internal $post not used}}
+ * @return array

  */
 function media_single_attachment_fields_to_edit( $form_fields, $post ) {
        unset($form_fields['url'], $form_fields['align'], $form_fields['image-size']);
  */
 function media_single_attachment_fields_to_edit( $form_fields, $post ) {
        unset($form_fields['url'], $form_fields['align'], $form_fields['image-size']);


@@ -983,9 +842,9 @@ function media_single_attachment_fields_to_edit( $form_fields, $post ) {
  *
  * @since 2.8.0
  *
  *
  * @since 2.8.0
  *

- * @param unknown_type $form_fields
- * @param unknown_type $post
- * @return unknown
+ * @param array $form_fields
+ * @param object $post {@internal $post not used}}
+ * @return array

  */
 function media_post_single_attachment_fields_to_edit( $form_fields, $post ) {
        unset($form_fields['image_url']);
  */
 function media_post_single_attachment_fields_to_edit( $form_fields, $post ) {
        unset($form_fields['image_url']);


@@ -993,13 +852,17 @@ function media_post_single_attachment_fields_to_edit( $form_fields, $post ) {
 }
 
 /**
 }
 
 /**

- * {@internal Missing Short Description}}
+ * Filters input from media_upload_form_handler() and assigns a default
+ * post_title from the file name if none supplied.
+ *
+ * Illustrates the use of the attachment_fields_to_save filter
+ * which can be used to add default values to any field before saving to DB.

  *
  * @since 2.5.0
  *
  *
  * @since 2.5.0
  *

- * @param unknown_type $post
- * @param unknown_type $attachment
- * @return unknown
+ * @param object $post
+ * @param array $attachment {@internal $attachment not used}}
+ * @return array

  */
 function image_attachment_fields_to_save($post, $attachment) {
        if ( substr($post['post_mime_type'], 0, 5) == 'image' ) {
  */
 function image_attachment_fields_to_save($post, $attachment) {
        if ( substr($post['post_mime_type'], 0, 5) == 'image' ) {


@@ -1019,13 +882,13 @@ add_filter('attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2
  *
  * @since 2.5.0
  *
  *
  * @since 2.5.0
  *

- * @param unknown_type $html
- * @param unknown_type $attachment_id
- * @param unknown_type $attachment
- * @return unknown
+ * @param string $html
+ * @param integer $attachment_id
+ * @param array $attachment
+ * @return array

  */
 function image_media_send_to_editor($html, $attachment_id, $attachment) {
  */
 function image_media_send_to_editor($html, $attachment_id, $attachment) {

-       $post =& get_post($attachment_id);
+       $post = get_post($attachment_id);

        if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
                $url = $attachment['url'];
                $align = !empty($attachment['align']) ? $attachment['align'] : 'none';
        if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
                $url = $attachment['url'];
                $align = !empty($attachment['align']) ? $attachment['align'] : 'none';


@@ -1046,22 +909,20 @@ add_filter('media_send_to_editor', 'image_media_send_to_editor', 10, 3);
  *
  * @since 2.5.0
  *
  *
  * @since 2.5.0
  *

- * @param unknown_type $post
- * @param unknown_type $errors
- * @return unknown
+ * @param object $post
+ * @param array $errors
+ * @return array

  */
 function get_attachment_fields_to_edit($post, $errors = null) {
        if ( is_int($post) )
  */
 function get_attachment_fields_to_edit($post, $errors = null) {
        if ( is_int($post) )

-               $post =& get_post($post);
+               $post = get_post($post);

        if ( is_array($post) )
        if ( is_array($post) )

-               $post = (object) $post;
+               $post = new WP_Post( (object) $post );

 
        $image_url = wp_get_attachment_url($post->ID);
 
        $edit_post = sanitize_post($post, 'edit');
 
 
        $image_url = wp_get_attachment_url($post->ID);
 
        $edit_post = sanitize_post($post, 'edit');
 

-
-

        $form_fields = array(
                'post_title'   => array(
                        'label'      => __('Title'),
        $form_fields = array(
                'post_title'   => array(
                        'label'      => __('Title'),


@@ -1070,7 +931,8 @@ function get_attachment_fields_to_edit($post, $errors = null) {
                'image_alt'   => array(),
                'post_excerpt' => array(
                        'label'      => __('Caption'),
                'image_alt'   => array(),
                'post_excerpt' => array(
                        'label'      => __('Caption'),

-                       'value'      => $edit_post->post_excerpt
+                       'input'      => 'html',
+                       'html'       => wp_caption_input_textarea($edit_post)

                ),
                'post_content' => array(
                        'label'      => __('Description'),
                ),
                'post_content' => array(
                        'label'      => __('Description'),


@@ -1098,7 +960,7 @@ function get_attachment_fields_to_edit($post, $errors = null) {
 
        foreach ( get_attachment_taxonomies($post) as $taxonomy ) {
                $t = (array) get_taxonomy($taxonomy);
 
        foreach ( get_attachment_taxonomies($post) as $taxonomy ) {
                $t = (array) get_taxonomy($taxonomy);

-               if ( ! $t['public'] )
+               if ( ! $t['public'] || ! $t['show_ui'] )

                        continue;
                if ( empty($t['label']) )
                        $t['label'] = $taxonomy;
                        continue;
                if ( empty($t['label']) )
                        $t['label'] = $taxonomy;


@@ -1106,13 +968,13 @@ function get_attachment_fields_to_edit($post, $errors = null) {
                        $t['args'] = array();
 
                $terms = get_object_term_cache($post->ID, $taxonomy);
                        $t['args'] = array();
 
                $terms = get_object_term_cache($post->ID, $taxonomy);

-               if ( empty($terms) )
+               if ( false === $terms )

                        $terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
 
                $values = array();
 
                foreach ( $terms as $term )
                        $terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
 
                $values = array();
 
                foreach ( $terms as $term )

-                       $values[] = $term->name;
+                       $values[] = $term->slug;

                $t['value'] = join(', ', $values);
 
                $form_fields[$taxonomy] = $t;
                $t['value'] = join(', ', $values);
 
                $form_fields[$taxonomy] = $t;


@@ -1122,6 +984,32 @@ function get_attachment_fields_to_edit($post, $errors = null) {
        // The recursive merge is easily traversed with array casting: foreach( (array) $things as $thing )
        $form_fields = array_merge_recursive($form_fields, (array) $errors);
 
        // 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().
+       if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
+               $alt = get_post_meta($post->ID, '_wp_attachment_image_alt', true);
+               if ( empty($alt) )
+                       $alt = '';
+
+               $form_fields['post_title']['required'] = true;
+
+               $form_fields['image_alt'] = array(
+                       'value' => $alt,
+                       'label' => __('Alternative Text'),
+                       'helps' => __('Alt text for the image, e.g. &#8220;The Mona Lisa&#8221;')
+               );
+
+               $form_fields['align'] = array(
+                       'label' => __('Alignment'),
+                       'input' => 'html',
+                       'html'  => image_align_input_fields($post, get_option('image_default_align')),
+               );
+
+               $form_fields['image-size'] = image_size_input_fields( $post, get_option('image_default_size', 'medium') );
+
+       } else {
+               unset( $form_fields['image_alt'] );
+       }
+

        $form_fields = apply_filters('attachment_fields_to_edit', $form_fields, $post);
 
        return $form_fields;
        $form_fields = apply_filters('attachment_fields_to_edit', $form_fields, $post);
 
        return $form_fields;


@@ -1159,7 +1047,7 @@ function get_media_items( $post_id, $errors ) {
                if ( $attachment->post_status == 'trash' )
                        continue;
                if ( $item = get_media_item( $id, array( 'errors' => isset($errors[$id]) ? $errors[$id] : null) ) )
                if ( $attachment->post_status == 'trash' )
                        continue;
                if ( $item = get_media_item( $id, array( 'errors' => isset($errors[$id]) ? $errors[$id] : null) ) )

-                       $output .= "\n<div id='media-item-$id' class='media-item child-of-$attachment->post_parent preloaded'><div class='progress'><div class='bar'></div></div><div id='media-upload-error-$id'></div><div class='filename'></div>$item\n</div>";
+                       $output .= "\n<div id='media-item-$id' class='media-item child-of-$attachment->post_parent preloaded'><div class='progress hidden'><div class='bar'></div></div><div id='media-upload-error-$id' class='hidden'></div><div class='filename hidden'></div>$item\n</div>";

        }
 
        return $output;
        }
 
        return $output;


@@ -1183,8 +1071,9 @@ function get_media_item( $attachment_id, $args = null ) {
                $thumb_url = false;
 
        $post = get_post( $attachment_id );
                $thumb_url = false;
 
        $post = get_post( $attachment_id );

+       $current_post_id = !empty( $_GET['post_id'] ) ? (int) $_GET['post_id'] : 0;

 
 

-       $default_args = array( 'errors' => null, 'send' => $post->post_parent ? post_type_supports( get_post_type( $post->post_parent ), 'editor' ) : true, 'delete' => true, 'toggle' => true, 'show_title' => true );
+       $default_args = array( 'errors' => null, 'send' => $current_post_id ? post_type_supports( get_post_type( $current_post_id ), 'editor' ) : true, 'delete' => true, 'toggle' => true, 'show_title' => true );

        $args = wp_parse_args( $args, $default_args );
        $args = apply_filters( 'get_media_item_args', $args );
        extract( $args, EXTR_SKIP );
        $args = wp_parse_args( $args, $default_args );
        $args = apply_filters( 'get_media_item_args', $args );
        extract( $args, EXTR_SKIP );


@@ -1192,7 +1081,7 @@ function get_media_item( $attachment_id, $args = null ) {
        $toggle_on  = __( 'Show' );
        $toggle_off = __( 'Hide' );
 
        $toggle_on  = __( 'Show' );
        $toggle_off = __( 'Hide' );
 

-       $filename = esc_html( basename( $post->guid ) );
+       $filename = esc_html( wp_basename( $post->guid ) );

        $title = esc_attr( $post->post_title );
 
        if ( $_tags = get_the_tags( $attachment_id ) ) {
        $title = esc_attr( $post->post_title );
 
        if ( $_tags = get_the_tags( $attachment_id ) ) {


@@ -1214,7 +1103,7 @@ function get_media_item( $attachment_id, $args = null ) {
        <a class='toggle describe-toggle-on' href='#'>$toggle_on</a>
        <a class='toggle describe-toggle-off' href='#'>$toggle_off</a>";
        } else {
        <a class='toggle describe-toggle-on' href='#'>$toggle_on</a>
        <a class='toggle describe-toggle-off' href='#'>$toggle_off</a>";
        } else {

-               $class = 'form-table';
+               $class = '';

                $toggle_links = '';
        }
 
                $toggle_links = '';
        }
 


@@ -1243,9 +1132,9 @@ function get_media_item( $attachment_id, $args = null ) {
        $media_dims = apply_filters( 'media_meta', $media_dims, $post );
 
        $image_edit_button = '';
        $media_dims = apply_filters( 'media_meta', $media_dims, $post );
 
        $image_edit_button = '';

-       if ( gd_edit_image_support( $post->post_mime_type ) ) {
+       if ( wp_attachment_is_image( $post->ID ) && wp_image_editor_supports( array( 'mime_type' => $post->post_mime_type ) ) ) {

                $nonce = wp_create_nonce( "image_editor-$post->ID" );
                $nonce = wp_create_nonce( "image_editor-$post->ID" );

-               $image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <img src='" . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . "' class='imgedit-wait-spin' alt='' />";
+               $image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <span class='spinner'></span>";

        }
 
        $attachment_url = get_permalink( $attachment_id );
        }
 
        $attachment_url = get_permalink( $attachment_id );


@@ -1259,7 +1148,7 @@ function get_media_item( $attachment_id, $args = null ) {
                <thead class='media-item-info' id='media-head-$post->ID'>
                <tr valign='top'>
                        <td class='A1B1' id='thumbnail-head-$post->ID'>
                <thead class='media-item-info' id='media-head-$post->ID'>
                <tr valign='top'>
                        <td class='A1B1' id='thumbnail-head-$post->ID'>

-                       <p><a href='$attachment_url' target='_blank'><img class='thumbnail' src='$thumb_url' alt='' style='margin-top: 3px' /></a></p>
+                       <p><a href='$attachment_url' target='_blank'><img class='thumbnail' src='$thumb_url' alt='' /></a></p>

                        <p>$image_edit_button</p>
                        </td>
                        <td>
                        <p>$image_edit_button</p>
                        </td>
                        <td>


@@ -1271,8 +1160,6 @@ function get_media_item( $attachment_id, $args = null ) {
 
                        $item .= "</td></tr>\n";
 
 
                        $item .= "</td></tr>\n";
 

-
-

        $item .= "
                </thead>
                <tbody>
        $item .= "
                </thead>
                <tbody>


@@ -1290,16 +1177,16 @@ function get_media_item( $attachment_id, $args = null ) {
                $send = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false );
        if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) {
                if ( !EMPTY_TRASH_DAYS ) {
                $send = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false );
        if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) {
                if ( !EMPTY_TRASH_DAYS ) {

-                       $delete = "<a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-attachment_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Delete Permanently' ) . '</a>';
+                       $delete = "<a href='" . wp_nonce_url( "post.php?action=delete&amp;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>
                } 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;'>" . sprintf( __( 'You are about to delete <strong>%s</strong>.' ), $filename ) . "
-                        <a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-attachment_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</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>
+                        <a href='" . wp_nonce_url( "post.php?action=delete&amp;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>";
                } else {
                         <a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . "</a>
                         </div>";
                } else {

-                       $delete = "<a href='" . wp_nonce_url( "post.php?action=trash&amp;post=$attachment_id", 'trash-attachment_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a>
-                       <a href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$attachment_id", 'untrash-attachment_' . $attachment_id ) . "' id='undo[$attachment_id]' class='undo hidden'>" . __( 'Undo' ) . "</a>";
+                       $delete = "<a href='" . wp_nonce_url( "post.php?action=trash&amp;post=$attachment_id", 'trash-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a>
+                       <a href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$attachment_id", 'untrash-post_' . $attachment_id ) . "' id='undo[$attachment_id]' class='undo hidden'>" . __( 'Undo' ) . "</a>";

                }
        } else {
                $delete = '';
                }
        } else {
                $delete = '';


@@ -1311,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;
                $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 = "<a class='wp-post-thumbnail' id='wp-post-thumbnail-" . $attachment_id . "' href='#' onclick='WPSetAsThumbnail(\"$attachment_id\", \"$ajax_nonce\");return false;'>" . esc_html__( "Use as featured image" ) . "</a>";
        }
                $ajax_nonce = wp_create_nonce( "set_post_thumbnail-$calling_post_id" );
                $thumbnail = "<a class='wp-post-thumbnail' id='wp-post-thumbnail-" . $attachment_id . "' href='#' onclick='WPSetAsThumbnail(\"$attachment_id\", \"$ajax_nonce\");return false;'>" . esc_html__( "Use as featured image" ) . "</a>";
        }


@@ -1347,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 ( !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 .= "<textarea type='text' id='$name' name='$name' $aria_required>" . $field['value'] . '</textarea>';
+                       // 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>';

                } else {
                        $item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "' $aria_required />";
                }
                } else {
                        $item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "' $aria_required />";
                }


@@ -1391,18 +1281,164 @@ function get_media_item( $attachment_id, $args = null ) {
        return $item;
 }
 
        return $item;
 }
 

+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'] ? '<span class="alignright"><abbr title="required" class="required">*</abbr></span>' : '';
+               $aria_required = $field['required'] ? " aria-required='true' " : '';
+               $class  = 'compat-field-' . $id;
+               $class .= $field['required'] ? ' form-required' : '';
+
+               $item .= "\t\t<tr class='$class'>";
+               $item .= "\t\t\t<th valign='top' scope='row' class='label'><label for='$id_attr'><span class='alignleft'>{$field['label']}</span>$required<br class='clear' /></label>";
+               $item .= "</th>\n\t\t\t<td class='field'>";
+
+               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 .= "<textarea id='$id_attr' name='$name' $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 />";
+               }
+               if ( !empty( $field['helps'] ) )
+                       $item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
+               $item .= "</td>\n\t\t</tr>\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<tr><td></td><td class='$class'>$html</td></tr>\n";
+       }
+
+       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>';
+
+       foreach ( $hidden_fields as $hidden_field => $value ) {
+               $item .= '<input type="hidden" name="' . esc_attr( $hidden_field ) . '" value="' . esc_attr( $value ) . '" />' . "\n";
+       }
+
+       if ( $item )
+               $item = '<input type="hidden" name="attachments[' . $attachment_id . '][menu_order]" value="' . esc_attr( $post->menu_order ) . '" />' . $item;
+
+       return array(
+               'item'   => $item,
+               'meta'   => $media_meta,
+       );
+}
+

 /**
  * {@internal Missing Short Description}}
  *
  * @since 2.5.0
  */
 function media_upload_header() {
 /**
  * {@internal Missing Short Description}}
  *
  * @since 2.5.0
  */
 function media_upload_header() {

-       ?>
-       <script type="text/javascript">post_id = <?php echo intval($_REQUEST['post_id']); ?>;</script>
-       <div id="media-upload-header">
-       <?php the_media_upload_tabs(); ?>
-       </div>
-       <?php
+       $post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
+       echo '<script type="text/javascript">post_id = ' . $post_id . ";</script>\n";
+       if ( empty( $_GET['chromeless'] ) ) {
+               echo '<div id="media-upload-header">';
+               the_media_upload_tabs();
+               echo '</div>';
+       }

 }
 
 /**
 }
 
 /**


@@ -1413,22 +1449,25 @@ function media_upload_header() {
  * @param unknown_type $errors
  */
 function media_upload_form( $errors = null ) {
  * @param unknown_type $errors
  */
 function media_upload_form( $errors = null ) {

-       global $type, $tab, $pagenow;
-
-       $flash_action_url = admin_url('async-upload.php');
+       global $type, $tab, $pagenow, $is_IE, $is_opera;

 
 

-       // 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 '<p>' . __('The web browser on your device cannot be used to upload files. You may be able to use the <a href="http://wordpress.org/extend/mobile/">native app for your device</a> instead.') . '</p>';
+               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;
        $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' );
        $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;
                $upload_size_unit /= 1024;

+       }
+

        if ( $u < 0 ) {
                $upload_size_unit = 0;
                $u = 0;
        if ( $u < 0 ) {
                $upload_size_unit = 0;
                $u = 0;


@@ -1436,122 +1475,90 @@ function media_upload_form( $errors = null ) {
                $upload_size_unit = (int) $upload_size_unit;
        }
 ?>
                $upload_size_unit = (int) $upload_size_unit;
        }
 ?>

-<script type="text/javascript">
-//<![CDATA[
-var uploaderMode = 0;
-jQuery(document).ready(function($){
-       uploaderMode = getUserSetting('uploader');
-       $('.upload-html-bypass a').click(function(){deleteUserSetting('uploader');uploaderMode=0;swfuploadPreLoad();return false;});
-       $('.upload-flash-bypass a').click(function(){setUserSetting('uploader', '1');uploaderMode=1;swfuploadPreLoad();return false;});
-});
-//]]>
-</script>
-<div id="media-upload-notice">
-<?php if (isset($errors['upload_notice']) ) { ?>
-       <?php echo $errors['upload_notice']; ?>
-<?php } ?>
-</div>
-<div id="media-upload-error">
-<?php if (isset($errors['upload_error']) && is_wp_error($errors['upload_error'])) { ?>
-       <?php echo $errors['upload_error']->get_error_message(); ?>
-<?php } ?>
-</div>
+
+<div id="media-upload-notice"><?php
+
+       if (isset($errors['upload_notice']) )
+               echo $errors['upload_notice'];
+
+?></div>
+<div id="media-upload-error"><?php
+
+       if (isset($errors['upload_error']) && is_wp_error($errors['upload_error']))
+               echo $errors['upload_error']->get_error_message();
+
+?></div>

 <?php
 <?php

-// Check quota for this blog if multisite

 if ( is_multisite() && !is_upload_space_available() ) {
 if ( is_multisite() && !is_upload_space_available() ) {

-       echo '<p>' . sprintf( __( 'Sorry, you have filled your storage quota (%s MB).' ), get_space_allowed() ) . '</p>';
+       do_action( 'upload_ui_over_quota' );

        return;
 }
 
 do_action('pre-upload-ui');
 
        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,
 $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'),
                "_wpnonce" => wp_create_nonce('media-form'),

-               "type" => $type,
-               "tab" => $tab,
+               "type" => $_type,
+               "tab" => $_tab,

                "short" => "1",
 );
                "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 );

 
 ?>
 
 ?>

+

 <script type="text/javascript">
 <script type="text/javascript">

-//<![CDATA[
-var swfu;
-SWFUpload.onload = function() {
-       var settings = {
-                       button_text: '<span class="button"><?php _e('Select Files'); ?><\/span>',
-                       button_text_style: '.button { text-align: center; font-weight: bold; font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif; font-size: 11px; text-shadow: 0 1px 0 #FFFFFF; color:#464646; }',
-                       button_height: "23",
-                       button_width: "132",
-                       button_text_top_padding: 3,
-                       button_image_url: '<?php echo $upload_image_path; ?>',
-                       button_placeholder_id: "flash-browse-button",
-                       upload_url : "<?php echo esc_attr( $flash_action_url ); ?>",
-                       flash_url : "<?php echo includes_url('js/swfupload/swfupload.swf'); ?>",
-                       file_post_name: "async-upload",
-                       file_types: "<?php echo apply_filters('upload_file_glob', '*.*'); ?>",
-                       post_params : {
-                               <?php echo $post_params_str; ?>
-                       },
-                       file_size_limit : "<?php echo $max_upload_size; ?>b",
-                       file_dialog_start_handler : fileDialogStart,
-                       file_queued_handler : fileQueued,
-                       upload_start_handler : uploadStart,
-                       upload_progress_handler : uploadProgress,
-                       upload_error_handler : uploadError,
-                       upload_success_handler : <?php echo apply_filters( 'swfupload_success_handler', 'uploadSuccess' ); ?>,
-                       upload_complete_handler : uploadComplete,
-                       file_queue_error_handler : fileQueueError,
-                       file_dialog_complete_handler : fileDialogComplete,
-                       swfupload_pre_load_handler: swfuploadPreLoad,
-                       swfupload_load_failed_handler: swfuploadLoadFailed,
-                       custom_settings : {
-                               degraded_element_id : "html-upload-ui", // id of the element displayed when swfupload is unavailable
-                               swfupload_element_id : "flash-upload-ui" // id of the element displayed when swfupload is available
-                       },
-                       debug: false
-               };
-               swfu = new SWFUpload(settings);
-};
-//]]>
+<?php
+// Verify size is an int. If not return default value.
+$large_size_h = absint( get_option('large_size_h') );
+if( !$large_size_h )
+       $large_size_h = 1024;
+$large_size_w = absint( get_option('large_size_w') );
+if( !$large_size_w )
+       $large_size_w = 1024;
+?>
+var resize_height = <?php echo $large_size_h; ?>, resize_width = <?php echo $large_size_w; ?>,
+wpUploaderInit = <?php echo json_encode($plupload_init); ?>;

 </script>
 
 </script>
 

-<div id="flash-upload-ui" class="hide-if-no-js">
-<?php do_action('pre-flash-upload-ui'); ?>
-
-       <div>
-       <?php _e( 'Choose files to upload' ); ?>
-       <div id="flash-browse-button"></div>
-       <span><input id="cancel-upload" disabled="disabled" onclick="cancelUpload()" type="button" value="<?php esc_attr_e('Cancel Upload'); ?>" class="button" /></span>
+<div id="plupload-upload-ui" class="hide-if-no-js">
+<?php do_action('pre-plupload-upload-ui'); // hook change, old name: 'pre-flash-upload-ui' ?>
+<div id="drag-drop-area">
+       <div class="drag-drop-inside">
+       <p class="drag-drop-info"><?php _e('Drop files here'); ?></p>
+       <p><?php _ex('or', 'Uploader: Drop files here - or - Select Files'); ?></p>
+       <p class="drag-drop-buttons"><input id="plupload-browse-button" type="button" value="<?php esc_attr_e('Select Files'); ?>" class="button" /></p>

        </div>
        </div>

-       <p class="media-upload-size"><?php printf( __( 'Maximum upload file size: %d%s' ), $upload_size_unit, $sizes[$u] ); ?></p>
-<?php do_action('post-flash-upload-ui'); ?>
-       <p class="howto"><?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></p>

 </div>
 </div>

-<?php endif; // $flash ?>
+<?php do_action('post-plupload-upload-ui'); // hook change, old name: 'post-flash-upload-ui' ?>
+</div>

 
 

-<div id="html-upload-ui">
+<div id="html-upload-ui" class="hide-if-js">

 <?php do_action('pre-html-upload-ui'); ?>
        <p id="async-upload-wrap">
                <label class="screen-reader-text" for="async-upload"><?php _e('Upload'); ?></label>
 <?php do_action('pre-html-upload-ui'); ?>
        <p id="async-upload-wrap">
                <label class="screen-reader-text" for="async-upload"><?php _e('Upload'); ?></label>


@@ -1560,14 +1567,16 @@ SWFUpload.onload = function() {
                <a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e('Cancel'); ?></a>
        </p>
        <div class="clear"></div>
                <a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e('Cancel'); ?></a>
        </p>
        <div class="clear"></div>

-       <p class="media-upload-size"><?php printf( __( 'Maximum upload file size: %d%s' ), $upload_size_unit, $sizes[$u] ); ?></p>
-       <?php if ( is_lighttpd_before_150() ): ?>
-       <p><?php _e('If you want to use all capabilities of the uploader, like uploading multiple files at once, please update to lighttpd 1.5.'); ?></p>
-       <?php endif;?>
-<?php do_action('post-html-upload-ui', $flash); ?>
+<?php do_action('post-html-upload-ui'); ?>

 </div>
 </div>

-<?php do_action('post-upload-ui'); ?>
+
+<span class="max-upload-size"><?php printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($sizes[$u]) ); ?></span>

 <?php
 <?php

+if ( ($is_IE || $is_opera) && $max_upload_size > 100 * 1024 * 1024 ) { ?>
+       <span class="big-file-warning"><?php _e('Your browser has some limitations uploading large files with the multi-file uploader. Please use the browser uploader for files over 100MB.'); ?></span>
+<?php }
+
+       do_action('post-upload-ui');

 }
 
 /**
 }
 
 /**


@@ -1575,20 +1584,25 @@ SWFUpload.onload = function() {
  *
  * @since 2.5.0
  *
  *
  * @since 2.5.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_form($type = 'file', $errors = null, $id = null) {
  */
 function media_upload_type_form($type = 'file', $errors = null, $id = null) {

+

        media_upload_header();
 
        $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);
        media_upload_header();
 
        $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';
+
+       if ( get_user_setting('uploader') )
+               $form_class .= ' html-uploader';

 ?>
 
 ?>
 

-<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="media-upload-form type-form validate" id="<?php echo $type; ?>-form">
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">

 <?php submit_button( '', 'hidden', 'save', false ); ?>
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
 <?php wp_nonce_field('media-form'); ?>
 <?php submit_button( '', 'hidden', 'save', false ); ?>
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
 <?php wp_nonce_field('media-form'); ?>


@@ -1608,19 +1622,19 @@ jQuery(function($){
 });
 //]]>
 </script>
 });
 //]]>
 </script>

-<div id="media-items">
-<?php
+<div id="media-items"><?php
+

 if ( $id ) {
        if ( !is_wp_error($id) ) {
                add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2);
                echo get_media_items( $id, $errors );
        } else {
 if ( $id ) {
        if ( !is_wp_error($id) ) {
                add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2);
                echo get_media_items( $id, $errors );
        } else {

-               echo '<div id="media-upload-error">'.esc_html($id->get_error_message()).'</div>';
+               echo '<div id="media-upload-error">'.esc_html($id->get_error_message()).'</div></div>';

                exit;
        }
 }
                exit;
        }
 }

-?>
-</div>
+?></div>
+

 <p class="savebutton ml-submit">
 <?php submit_button( __( 'Save all changes' ), 'button', 'save', false ); ?>
 </p>
 <p class="savebutton ml-submit">
 <?php submit_button( __( 'Save all changes' ), 'button', 'save', false ); ?>
 </p>


@@ -1633,28 +1647,31 @@ if ( $id ) {
  *
  * @since 2.7.0
  *
  *
  * @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();
 
        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_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';

 ?>
 
 ?>
 

-<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="media-upload-form type-form validate" id="<?php echo $type; ?>-form">
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">

 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
 <?php wp_nonce_field('media-form'); ?>
 
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
 <?php wp_nonce_field('media-form'); ?>
 

-<?php if ( is_callable($callback) ) { ?>
-
-<h3 class="media-title"><?php _e('Add media file from URL'); ?></h3>
+<h3 class="media-title"><?php _e('Insert media from another website'); ?></h3>

 
 <script type="text/javascript">
 //<![CDATA[
 
 <script type="text/javascript">
 //<![CDATA[


@@ -1670,28 +1687,31 @@ var addExtImage = {
                if ( '' == f.src.value || '' == t.width )
                        return false;
 
                if ( '' == f.src.value || '' == t.width )
                        return false;
 

-               if ( f.title.value ) {
-                       title = f.title.value.replace(/'/g, '&#039;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-                       title = ' title="'+title+'"';
-               }
-

                if ( f.alt.value )
                        alt = f.alt.value.replace(/'/g, '&#039;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 
 <?php if ( ! apply_filters( 'disable_captions', '' ) ) { ?>
                if ( f.alt.value )
                        alt = f.alt.value.replace(/'/g, '&#039;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 
 <?php if ( ! apply_filters( 'disable_captions', '' ) ) { ?>

-               if ( f.caption.value )
-                       caption = f.caption.value.replace(/'/g, '&#039;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+               if ( f.caption.value ) {
+                       caption = f.caption.value.replace(/\r\n|\r/g, '\n');
+                       caption = caption.replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g, function(a){
+                               return a.replace(/[\r\n\t]+/, ' ');
+                       });
+
+                       caption = caption.replace(/\s*\n\s*/g, '<br />');
+               }

 <?php } ?>
 
                cls = caption ? '' : ' class="'+t.align+'"';
 
 <?php } ?>
 
                cls = caption ? '' : ' class="'+t.align+'"';
 

-               html = '<img alt="'+alt+'" src="'+f.src.value+'"'+title+cls+' width="'+t.width+'" height="'+t.height+'" />';
+               html = '<img alt="'+alt+'" src="'+f.src.value+'"'+cls+' width="'+t.width+'" height="'+t.height+'" />';

 
 

-               if ( f.url.value )
-                       html = '<a href="'+f.url.value+'">'+html+'</a>';
+               if ( f.url.value ) {
+                       url = f.url.value.replace(/'/g, '&#039;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+                       html = '<a href="'+url+'">'+html+'</a>';
+               }

 
                if ( caption )
 
                if ( caption )

-                       html = '[caption id="" align="'+t.align+'" width="'+t.width+'" caption="'+caption+'"]'+html+'[/caption]';
+                       html = '[caption id="" align="'+t.align+'" width="'+t.width+'"]'+html+caption+'[/caption]';

 
                var win = window.dialogArguments || opener || parent || top;
                win.send_to_editor(html);
 
                var win = window.dialogArguments || opener || parent || top;
                win.send_to_editor(html);


@@ -1718,40 +1738,48 @@ var addExtImage = {
        },
 
        getImageData : function() {
        },
 
        getImageData : function() {

+               if ( jQuery('table.describe').hasClass('not-image') )
+                       return;
+

                var t = addExtImage, src = document.forms[0].src.value;
 
                if ( ! src ) {
                        t.resetImageData();
                        return false;
                }
                var t = addExtImage, src = document.forms[0].src.value;
 
                if ( ! src ) {
                        t.resetImageData();
                        return false;
                }

-               document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />';
+
+               document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" width="16" />';

                t.preloadImg = new Image();
                t.preloadImg.onload = t.updateImageData;
                t.preloadImg.onerror = t.resetImageData;
                t.preloadImg.src = src;
        }
 }
                t.preloadImg = new Image();
                t.preloadImg.onload = t.updateImageData;
                t.preloadImg.onerror = t.resetImageData;
                t.preloadImg.src = src;
        }
 }

+
+jQuery(document).ready( function($) {
+       $('.media-types input').click( function() {
+               $('table.describe').toggleClass('not-image', $('#not-image').prop('checked') );
+       });
+});
+

 //]]>
 </script>
 
 <div id="media-items">
 <div class="media-item media-blank">
 //]]>
 </script>
 
 <div id="media-items">
 <div class="media-item media-blank">

-<?php echo apply_filters($callback, call_user_func($callback)); ?>
+<?php echo apply_filters( 'type_url_form_media', wp_media_insert_url_form( $type ) ); ?>

 </div>
 </div>
 </form>
 <?php
 </div>
 </div>
 </form>
 <?php

-       } else {
-               wp_die( __('Unknown action.') );
-       }

 }
 
 /**
 }
 
 /**

- * {@internal Missing Short Description}}
+ * Adds gallery form to upload iframe

  *
  * @since 2.5.0
  *
  *
  * @since 2.5.0
  *

- * @param unknown_type $errors
+ * @param array $errors

  */
 function media_upload_gallery_form($errors) {
        global $redir_tab, $type;
  */
 function media_upload_gallery_form($errors) {
        global $redir_tab, $type;


@@ -1762,6 +1790,10 @@ function media_upload_gallery_form($errors) {
        $post_id = intval($_REQUEST['post_id']);
        $form_action_url = admin_url("media-upload.php?type=$type&tab=gallery&post_id=$post_id");
        $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);
        $post_id = intval($_REQUEST['post_id']);
        $form_action_url = admin_url("media-upload.php?type=$type&tab=gallery&post_id=$post_id");
        $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);

+       $form_class = 'media-upload-form validate';
+
+       if ( get_user_setting('uploader') )
+               $form_class .= ' html-uploader';

 ?>
 
 <script type="text/javascript">
 ?>
 
 <script type="text/javascript">


@@ -1786,7 +1818,7 @@ jQuery(function($){
 <a href="#" id="desc"><?php _e('Descending'); ?></a> |
 <a href="#" id="clear"><?php _ex('Clear', 'verb'); ?></a>
 </div>
 <a href="#" id="desc"><?php _e('Descending'); ?></a> |
 <a href="#" id="clear"><?php _ex('Clear', 'verb'); ?></a>
 </div>

-<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="media-upload-form validate" id="gallery-form">
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="<?php echo $form_class; ?>" id="gallery-form">

 <?php wp_nonce_field('media-form'); ?>
 <?php //media_upload_form( $errors ); ?>
 <table class="widefat" cellspacing="0">
 <?php wp_nonce_field('media-form'); ?>
 <?php //media_upload_form( $errors ); ?>
 <table class="widefat" cellspacing="0">


@@ -1836,7 +1868,7 @@ jQuery(function($){
                <select id="orderby" name="orderby">
                        <option value="menu_order" selected="selected"><?php _e('Menu order'); ?></option>
                        <option value="title"><?php _e('Title'); ?></option>
                <select id="orderby" name="orderby">
                        <option value="menu_order" selected="selected"><?php _e('Menu order'); ?></option>
                        <option value="title"><?php _e('Title'); ?></option>

-                       <option value="ID"><?php _e('Date/Time'); ?></option>
+                       <option value="post_date"><?php _e('Date/Time'); ?></option>

                        <option value="rand"><?php _e('Random'); ?></option>
                </select>
        </td>
                        <option value="rand"><?php _e('Random'); ?></option>
                </select>
        </td>


@@ -1893,17 +1925,21 @@ jQuery(function($){
  *
  * @since 2.5.0
  *
  *
  * @since 2.5.0
  *

- * @param unknown_type $errors
+ * @param array $errors

  */
 function media_upload_library_form($errors) {
        global $wpdb, $wp_query, $wp_locale, $type, $tab, $post_mime_types;
 
        media_upload_header();
 
  */
 function media_upload_library_form($errors) {
        global $wpdb, $wp_query, $wp_locale, $type, $tab, $post_mime_types;
 
        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=library&post_id=$post_id");
        $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);
 
        $form_action_url = admin_url("media-upload.php?type=$type&tab=library&post_id=$post_id");
        $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);

+       $form_class = 'media-upload-form validate';
+
+       if ( get_user_setting('uploader') )
+               $form_class .= ' html-uploader';

 
        $_GET['paged'] = isset( $_GET['paged'] ) ? intval($_GET['paged']) : 0;
        if ( $_GET['paged'] < 1 )
 
        $_GET['paged'] = isset( $_GET['paged'] ) ? intval($_GET['paged']) : 0;
        if ( $_GET['paged'] < 1 )


@@ -1922,10 +1958,11 @@ function media_upload_library_form($errors) {
 <input type="hidden" name="tab" value="<?php echo esc_attr( $tab ); ?>" />
 <input type="hidden" name="post_id" value="<?php echo (int) $post_id; ?>" />
 <input type="hidden" name="post_mime_type" value="<?php echo isset( $_GET['post_mime_type'] ) ? esc_attr( $_GET['post_mime_type'] ) : ''; ?>" />
 <input type="hidden" name="tab" value="<?php echo esc_attr( $tab ); ?>" />
 <input type="hidden" name="post_id" value="<?php echo (int) $post_id; ?>" />
 <input type="hidden" name="post_mime_type" value="<?php echo isset( $_GET['post_mime_type'] ) ? esc_attr( $_GET['post_mime_type'] ) : ''; ?>" />

+<input type="hidden" name="context" value="<?php echo isset( $_GET['context'] ) ? esc_attr( $_GET['context'] ) : ''; ?>" />

 
 <p id="media-search" class="search-box">
        <label class="screen-reader-text" for="media-search-input"><?php _e('Search Media');?>:</label>
 
 <p id="media-search" class="search-box">
        <label class="screen-reader-text" for="media-search-input"><?php _e('Search Media');?>:</label>

-       <input type="text" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
+       <input type="search" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />

        <?php submit_button( __( 'Search Media' ), 'button', '', false ); ?>
 </p>
 
        <?php submit_button( __( 'Search Media' ), 'button', '', false ); ?>
 </p>
 


@@ -2013,7 +2050,7 @@ foreach ($arc_result as $arc_row) {
 </select>
 <?php } ?>
 
 </select>
 <?php } ?>
 

-<?php submit_button( __( 'Filter &#187;' ), 'secondary', 'post-query-submit', false ); ?>
+<?php submit_button( __( 'Filter &#187;' ), 'button', 'post-query-submit', false ); ?>

 
 </div>
 
 
 </div>
 


@@ -2021,7 +2058,7 @@ foreach ($arc_result as $arc_row) {
 </div>
 </form>
 
 </div>
 </form>
 

-<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="media-upload-form validate" id="library-form">
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="<?php echo $form_class; ?>" id="library-form">

 
 <?php wp_nonce_field('media-form'); ?>
 <?php //media_upload_form( $errors ); ?>
 
 <?php wp_nonce_field('media-form'); ?>
 <?php //media_upload_form( $errors ); ?>


@@ -2051,20 +2088,21 @@ jQuery(function($){
 }
 
 /**
 }
 
 /**

- * {@internal Missing Short Description}}
+ * Creates the form for external url

  *
  * @since 2.7.0
  *
  *
  * @since 2.7.0
  *

- * @return unknown
+ * @param string $default_view
+ * @return string the form html

  */
  */

-function type_url_form_image() {
+function wp_media_insert_url_form( $default_view = 'image' ) {

        if ( !apply_filters( 'disable_captions', '' ) ) {
                $caption = '
        if ( !apply_filters( 'disable_captions', '' ) ) {
                $caption = '

-               <tr>
+               <tr class="image-only">

                        <th valign="top" scope="row" class="label">
                        <th valign="top" scope="row" class="label">

-                               <span class="alignleft"><label for="caption">' . __('Image Caption') . '</label></span>
+                               <label for="caption"><span class="alignleft">' . __('Image Caption') . '</span></label>

                        </th>
                        </th>

-                       <td class="field"><input id="caption" name="caption" value="" type="text" /></td>
+                       <td class="field"><textarea id="caption" name="caption"></textarea></td>

                </tr>
 ';
        } else {
                </tr>
 ';
        } else {


@@ -2075,12 +2113,19 @@ function type_url_form_image() {
        if ( empty($default_align) )
                $default_align = 'none';
 
        if ( empty($default_align) )
                $default_align = 'none';
 

+       if ( 'image' == $default_view ) {
+               $view = 'image-only';
+               $table_class = '';
+       } else {
+               $view = $table_class = 'not-image';
+       }
+

        return '
        return '

-       <h4 class="media-sub-title">' . __('Insert an image from another web site') . '</h4>
-       <table class="describe"><tbody>
+       <p class="media-types"><label><input type="radio" name="media_type" value="image" id="image-only"' . checked( 'image-only', $view, false ) . ' /> ' . __( 'Image' ) . '</label> &nbsp; &nbsp; <label><input type="radio" name="media_type" value="generic" id="not-image"' . checked( 'not-image', $view, false ) . ' /> ' . __( 'Audio, Video, or Other File' ) . '</label></p>
+       <table class="describe ' . $table_class . '"><tbody>

                <tr>
                        <th valign="top" scope="row" class="label" style="width:130px;">
                <tr>
                        <th valign="top" scope="row" class="label" style="width:130px;">

-                               <span class="alignleft"><label for="src">' . __('Image URL') . '</label></span>
+                               <label for="src"><span class="alignleft">' . __('URL') . '</span></label>

                                <span class="alignright"><abbr id="status_img" title="required" class="required">*</abbr></span>
                        </th>
                        <td class="field"><input id="src" name="src" value="" type="text" aria-required="true" onblur="addExtImage.getImageData()" /></td>
                                <span class="alignright"><abbr id="status_img" title="required" class="required">*</abbr></span>
                        </th>
                        <td class="field"><input id="src" name="src" value="" type="text" aria-required="true" onblur="addExtImage.getImageData()" /></td>


@@ -2088,21 +2133,23 @@ function type_url_form_image() {
 
                <tr>
                        <th valign="top" scope="row" class="label">
 
                <tr>
                        <th valign="top" scope="row" class="label">

-                               <span class="alignleft"><label for="title">' . __('Image Title') . '</label></span>
+                               <label for="title"><span class="alignleft">' . __('Title') . '</span></label>

                                <span class="alignright"><abbr title="required" class="required">*</abbr></span>
                        </th>
                        <td class="field"><input id="title" name="title" value="" type="text" aria-required="true" /></td>
                </tr>
 
                                <span class="alignright"><abbr title="required" class="required">*</abbr></span>
                        </th>
                        <td class="field"><input id="title" name="title" value="" type="text" aria-required="true" /></td>
                </tr>
 

-               <tr>
+               <tr class="not-image"><td></td><td><p class="help">' . __('Link text, e.g. &#8220;Ransom Demands (PDF)&#8221;') . '</p></td></tr>
+
+               <tr class="image-only">

                        <th valign="top" scope="row" class="label">
                        <th valign="top" scope="row" class="label">

-                               <span class="alignleft"><label for="alt">' . __('Alternate Text') . '</label></span>
+                               <label for="alt"><span class="alignleft">' . __('Alternative Text') . '</span></label>

                        </th>
                        <td class="field"><input id="alt" name="alt" value="" type="text" aria-required="true" />
                        <p class="help">' . __('Alt text for the image, e.g. &#8220;The Mona Lisa&#8221;') . '</p></td>
                </tr>
                ' . $caption . '
                        </th>
                        <td class="field"><input id="alt" name="alt" value="" type="text" aria-required="true" />
                        <p class="help">' . __('Alt text for the image, e.g. &#8220;The Mona Lisa&#8221;') . '</p></td>
                </tr>
                ' . $caption . '

-               <tr class="align">
+               <tr class="align image-only">

                        <th valign="top" scope="row" class="label"><p><label for="align">' . __('Alignment') . '</label></p></th>
                        <td class="field">
                                <input name="align" id="align-none" value="none" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'none' ? ' checked="checked"' : '').' />
                        <th valign="top" scope="row" class="label"><p><label for="align">' . __('Alignment') . '</label></p></th>
                        <td class="field">
                                <input name="align" id="align-none" value="none" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'none' ? ' checked="checked"' : '').' />


@@ -2116,9 +2163,9 @@ function type_url_form_image() {
                        </td>
                </tr>
 
                        </td>
                </tr>
 

-               <tr>
+               <tr class="image-only">

                        <th valign="top" scope="row" class="label">
                        <th valign="top" scope="row" class="label">

-                               <span class="alignleft"><label for="url">' . __('Link Image To:') . '</label></span>
+                               <label for="url"><span class="alignleft">' . __('Link Image To:') . '</span></label>

                        </th>
                        <td class="field"><input id="url" name="url" value="" type="text" /><br />
 
                        </th>
                        <td class="field"><input id="url" name="url" value="" type="text" /><br />
 


@@ -2126,203 +2173,225 @@ function type_url_form_image() {
                        <button type="button" class="button" value="" onclick="document.forms[0].url.value=document.forms[0].src.value">' . __('Link to image') . '</button>
                        <p class="help">' . __('Enter a link URL or click above for presets.') . '</p></td>
                </tr>
                        <button type="button" class="button" value="" onclick="document.forms[0].url.value=document.forms[0].src.value">' . __('Link to image') . '</button>
                        <p class="help">' . __('Enter a link URL or click above for presets.') . '</p></td>
                </tr>

-       ' . _insert_into_post_button('image') . '
+               <tr class="image-only">
+                       <td></td>
+                       <td>
+                               <input type="button" class="button" id="go_button" style="color:#bbb;" onclick="addExtImage.insert()" value="' . esc_attr__('Insert into Post') . '" />
+                       </td>
+               </tr>
+               <tr class="not-image">
+                       <td></td>
+                       <td>
+                               ' . get_submit_button( __( 'Insert into Post' ), 'button', 'insertonlybutton', false ) . '
+                       </td>
+               </tr>

        </tbody></table>
 ';
 
 }
 
 /**
        </tbody></table>
 ';
 
 }
 
 /**

- * {@internal Missing Short Description}}
+ * Displays the multi-file uploader message.

  *
  *

- * @since 2.7.0
- *
- * @return unknown
+ * @since 2.6.0

  */
  */

-function type_url_form_audio() {
-       return '
-       <table class="describe"><tbody>
-               <tr>
-                       <th valign="top" scope="row" class="label">
-                               <span class="alignleft"><label for="insertonly[href]">' . __('Audio File URL') . '</label></span>
-                               <span class="alignright"><abbr title="required" class="required">*</abbr></span>
-                       </th>
-                       <td class="field"><input id="insertonly[href]" name="insertonly[href]" value="" type="text" aria-required="true"></td>
-               </tr>
-               <tr>
-                       <th valign="top" scope="row" class="label">
-                               <span class="alignleft"><label for="insertonly[title]">' . __('Title') . '</label></span>
-                               <span class="alignright"><abbr title="required" class="required">*</abbr></span>
-                       </th>
-                       <td class="field"><input id="insertonly[title]" name="insertonly[title]" value="" type="text" aria-required="true"></td>
-               </tr>
-               <tr><td></td><td class="help">' . __('Link text, e.g. &#8220;Still Alive by Jonathan Coulton&#8221;') . '</td></tr>
-       ' . _insert_into_post_button('audio') . '
-       </tbody></table>
-';
+function media_upload_flash_bypass() {
+       $browser_uploader = admin_url( 'media-new.php?browser-uploader' );
+
+       if ( $post = get_post() )
+               $browser_uploader .= '&amp;post_id=' . intval( $post->ID );
+       elseif ( ! empty( $GLOBALS['post_ID'] ) )
+               $browser_uploader .= '&amp;post_id=' . intval( $GLOBALS['post_ID'] );
+
+       ?>
+       <p class="upload-flash-bypass">
+       <?php printf( __( 'You are using the multi-file uploader. Problems? Try the <a href="%1$s" target="%2$s">browser uploader</a> instead.' ), $browser_uploader, '_blank' ); ?>
+       </p>
+       <?php

 }
 }

+add_action('post-plupload-upload-ui', 'media_upload_flash_bypass');

 
 /**
 
 /**

- * {@internal Missing Short Description}}
- *
- * @since 2.7.0
+ * Displays the browser's built-in uploader message.

  *
  *

- * @return unknown
+ * @since 2.6.0

  */
  */

-function type_url_form_video() {
-       return '
-       <table class="describe"><tbody>
-               <tr>
-                       <th valign="top" scope="row" class="label">
-                               <span class="alignleft"><label for="insertonly[href]">' . __('Video URL') . '</label></span>
-                               <span class="alignright"><abbr title="required" class="required">*</abbr></span>
-                       </th>
-                       <td class="field"><input id="insertonly[href]" name="insertonly[href]" value="" type="text" aria-required="true"></td>
-               </tr>
-               <tr>
-                       <th valign="top" scope="row" class="label">
-                               <span class="alignleft"><label for="insertonly[title]">' . __('Title') . '</label></span>
-                               <span class="alignright"><abbr title="required" class="required">*</abbr></span>
-                       </th>
-                       <td class="field"><input id="insertonly[title]" name="insertonly[title]" value="" type="text" aria-required="true"></td>
-               </tr>
-               <tr><td></td><td class="help">' . __('Link text, e.g. &#8220;Lucy on YouTube&#8221;') . '</td></tr>
-       ' . _insert_into_post_button('video') . '
-       </tbody></table>
-';
+function media_upload_html_bypass() {
+       ?>
+       <p class="upload-html-bypass hide-if-no-js">
+       <?php _e('You are using the browser&#8217;s built-in file uploader. The WordPress uploader includes multiple file selection and drag and drop capability. <a href="#">Switch to the multi-file uploader</a>.'); ?>
+       </p>
+       <?php

 }
 }

+add_action('post-html-upload-ui', 'media_upload_html_bypass');

 
 /**
 
 /**

- * {@internal Missing Short Description}}
- *
- * @since 2.7.0
+ * Used to display a "After a file has been uploaded..." help message.

  *
  *

- * @return unknown
+ * @since 3.3.0

  */
  */

-function type_url_form_file() {
-       return '
-       <table class="describe"><tbody>
-               <tr>
-                       <th valign="top" scope="row" class="label">
-                               <span class="alignleft"><label for="insertonly[href]">' . __('URL') . '</label></span>
-                               <span class="alignright"><abbr title="required" class="required">*</abbr></span>
-                       </th>
-                       <td class="field"><input id="insertonly[href]" name="insertonly[href]" value="" type="text" aria-required="true"></td>
-               </tr>
-               <tr>
-                       <th valign="top" scope="row" class="label">
-                               <span class="alignleft"><label for="insertonly[title]">' . __('Title') . '</label></span>
-                               <span class="alignright"><abbr title="required" class="required">*</abbr></span>
-                       </th>
-                       <td class="field"><input id="insertonly[title]" name="insertonly[title]" value="" type="text" aria-required="true"></td>
-               </tr>
-               <tr><td></td><td class="help">' . __('Link text, e.g. &#8220;Ransom Demands (PDF)&#8221;') . '</td></tr>
-       ' . _insert_into_post_button('file') . '
-       </tbody></table>
-';
-}
-
-
-function _insert_into_post_button($type) {
-       if ( !post_type_supports(get_post_type($_GET['post_id']), 'editor') )
-               return '';
-
-       if ( 'image' == $type )
-       return '
-               <tr>
-                       <td></td>
-                       <td>
-                               <input type="button" class="button" id="go_button" style="color:#bbb;" onclick="addExtImage.insert()" value="' . esc_attr__('Insert into Post') . '" />
-                       </td>
-               </tr>
-       ';
-
-       return '
-               <tr>
-                       <td></td>
-                       <td>
-                               ' . get_submit_button( __( 'Insert into Post' ), 'button', 'insertonlybutton', false ) . '
-                       </td>
-               </tr>
-       ';
-}
+function media_upload_text_after() {}

 
 /**
 
 /**

- * {@internal Missing Short Description}}
+ * Displays the checkbox to scale images.

  *
  *

- * Support a GET parameter for disabling the flash uploader.
- *
- * @since 2.6.0
- *
- * @param unknown_type $flash
- * @return unknown
+ * @since 3.3.0

  */
  */

-function media_upload_use_flash($flash) {
-       if ( array_key_exists('flash', $_REQUEST) )
-               $flash = !empty($_REQUEST['flash']);
-       return $flash;
-}
+function media_upload_max_image_resize() {
+       $checked = get_user_setting('upload_resize') ? ' checked="true"' : '';
+       $a = $end = '';

 
 

-add_filter('flash_uploader', 'media_upload_use_flash');
+       if ( current_user_can( 'manage_options' ) ) {
+               $a = '<a href="' . esc_url( admin_url( 'options-media.php' ) ) . '" target="_blank">';
+               $end = '</a>';
+       }
+?>
+<p class="hide-if-no-js"><label>
+<input name="image_resize" type="checkbox" id="image_resize" value="true"<?php echo $checked; ?> />
+<?php
+       /* translators: %1$s is link start tag, %2$s is link end tag, %3$d is width, %4$d is height*/
+       printf( __( 'Scale images to match the large size selected in %1$simage options%2$s (%3$d &times; %4$d).' ), $a, $end, (int) get_option( 'large_size_w', '1024' ), (int) get_option( 'large_size_h', '1024' ) );
+?>
+</label></p>
+<?php
+}

 
 /**
 
 /**

- * {@internal Missing Short Description}}
+ * Displays the out of storage quota message in Multisite.

  *
  *

- * @since 2.6.0
+ * @since 3.5.0

  */
  */

-function media_upload_flash_bypass() {
-       echo '<p class="upload-flash-bypass">';
-       printf( __('You are using the Flash uploader.  Problems?  Try the <a href="%s">Browser uploader</a> instead.'), esc_url(add_query_arg('flash', 0)) );
-       echo '</p>';
+function multisite_over_quota_message() {
+       echo '<p>' . sprintf( __( 'Sorry, you have used all of your storage quota of %s MB.' ), get_space_allowed() ) . '</p>';

 }
 
 /**
 }
 
 /**

- * {@internal Missing Short Description}}
+ * Displays the image and editor in the post editor

  *
  *

- * @since 2.6.0
+ * @since 3.5.0

  */
  */

-function media_upload_html_bypass($flash = true) {
-       echo '<p class="upload-html-bypass hide-if-no-js">';
-       _e('You are using the Browser uploader.');
-       if ( $flash ) {
-               // the user manually selected the browser uploader, so let them switch back to Flash
-               echo ' ';
-               printf( __('Try the <a href="%s">Flash uploader</a> instead.'), esc_url(add_query_arg('flash', 1)) );
-       }
-       echo "</p>\n";
-}
+function edit_form_image_editor( $post ) {
+       $open = isset( $_GET['image-editor'] );
+       if ( $open )
+               require_once ABSPATH . 'wp-admin/includes/image-edit.php';

 
 

-add_action('post-flash-upload-ui', 'media_upload_flash_bypass');
-add_action('post-html-upload-ui', 'media_upload_html_bypass');
+       $thumb_url = false;
+       if ( $attachment_id = intval( $post->ID ) )
+               $thumb_url = wp_get_attachment_image_src( $attachment_id, array( 900, 450 ), true );
+
+       $filename = esc_html( basename( $post->guid ) );
+       $title = esc_attr( $post->post_title );
+       $alt_text = get_post_meta( $post->ID, '_wp_attachment_image_alt', true );
+
+       $att_url = wp_get_attachment_url( $post->ID );
+
+       if ( wp_attachment_is_image( $post->ID ) ) :
+               $image_edit_button = '';
+               if ( wp_image_editor_supports( array( 'mime_type' => $post->post_mime_type ) ) ) {
+                       $nonce = wp_create_nonce( "image_editor-$post->ID" );
+                       $image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <span class='spinner'></span>";
+               }
+       ?>
+       <div class="wp_attachment_holder">
+               <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; ?>">
+                       <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>
+               <div<?php if ( ! $open ) echo ' style="display:none"'; ?> class="image-editor" id="image-editor-<?php echo $attachment_id; ?>">
+                       <?php if ( $open ) wp_image_editor( $attachment_id ); ?>
+               </div>
+       </div>
+       <?php endif; ?>
+
+       <div class="wp_attachment_details">
+               <p>
+                       <label for="attachment_caption"><strong><?php _e( 'Caption' ); ?></strong></label><br />
+                       <textarea class="widefat" name="excerpt" id="attachment_caption"><?php echo $post->post_excerpt; ?></textarea>
+               </p>
+
+       <?php if ( 'image' === substr( $post->post_mime_type, 0, 5 ) ) : ?>
+               <p>
+                       <label for="attachment_alt"><strong><?php _e( 'Alternative Text' ); ?></strong></label><br />
+                       <input type="text" class="widefat" name="_wp_attachment_image_alt" id="attachment_alt" value="<?php echo esc_attr( $alt_text ); ?>" />
+               </p>
+       <?php endif; ?>
+
+       <?php
+               $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
+               $editor_args = array(
+                       'textarea_name' => 'content',
+                       'textarea_rows' => 5,
+                       'media_buttons' => false,
+                       'tinymce' => false,
+                       'quicktags' => $quicktags_settings,
+               );
+       ?>
+
+       <label for="content"><strong><?php _e( 'Description' ); ?></strong></label>
+       <?php wp_editor( $post->post_content, 'attachment_content', $editor_args ); ?>
+
+       </div>
+       <?php
+       $extras = get_compat_media_markup( $post->ID );
+       echo $extras['item'];
+       echo '<input type="hidden" id="image-edit-context" value="edit-attachment" />' . "\n";
+}

 
 /**
 
 /**

- * {@internal Missing Short Description}}
- *
- * Make sure the GET parameter sticks when we submit a form.
- *
- * @since 2.6.0
+ * Displays non-editable attachment metadata in the publish metabox

  *
  *

- * @param unknown_type $url
- * @return unknown
+ * @since 3.5.0

  */
  */

-function media_upload_bypass_url($url) {
-       if ( array_key_exists('flash', $_REQUEST) )
-               $url = add_query_arg('flash', intval($_REQUEST['flash']));
-       return $url;
-}
+function attachment_submitbox_metadata() {
+       $post = get_post();
+
+       $filename = esc_html( basename( $post->guid ) );
+
+       $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 .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
+       $media_dims = apply_filters( 'media_meta', $media_dims, $post );
+
+       $att_url = wp_get_attachment_url( $post->ID );
+?>
+       <div class="misc-pub-section">
+                       <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); ?>" />
+       </div>
+       <div class="misc-pub-section">
+               <?php _e( 'File name:' ); ?> <strong><?php echo $filename; ?></strong>
+       </div>
+       <div class="misc-pub-section">
+               <?php _e( 'File type:' ); ?> <strong><?php
+                       if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) )
+                               echo esc_html( strtoupper( $matches[1] ) );
+                       else
+                               echo strtoupper( str_replace( 'image/', '', $post->post_mime_type ) );
+               ?></strong>
+       </div>

 
 

-add_filter('media_upload_form_url', 'media_upload_bypass_url');
+<?php if ( $media_dims ) : ?>
+       <div class="misc-pub-section">
+               <?php _e( 'Dimensions:' ); ?> <strong><?php echo $media_dims; ?></strong>
+       </div>
+<?php
+       endif;
+}

 
 

-add_filter('async_upload_image', 'get_media_item', 10, 2);
-add_filter('async_upload_audio', 'get_media_item', 10, 2);
-add_filter('async_upload_video', 'get_media_item', 10, 2);
-add_filter('async_upload_file', 'get_media_item', 10, 2);
+add_filter( 'async_upload_image', 'get_media_item', 10, 2 );
+add_filter( 'async_upload_audio', 'get_media_item', 10, 2 );
+add_filter( 'async_upload_video', 'get_media_item', 10, 2 );
+add_filter( 'async_upload_file',  'get_media_item', 10, 2 );

 
 

-add_action('media_upload_image', 'media_upload_image');
-add_action('media_upload_audio', 'media_upload_audio');
-add_action('media_upload_video', 'media_upload_video');
-add_action('media_upload_file', 'media_upload_file');
+add_action( 'media_upload_image', 'wp_media_upload_handler' );
+add_action( 'media_upload_audio', 'wp_media_upload_handler' );
+add_action( 'media_upload_video', 'wp_media_upload_handler' );
+add_action( 'media_upload_file',  'wp_media_upload_handler' );

 
 

-add_filter('media_upload_gallery', 'media_upload_gallery');
+add_filter( 'media_upload_gallery', 'media_upload_gallery' );
+add_filter( 'media_upload_library', 'media_upload_library' );

 
 

-add_filter('media_upload_library', 'media_upload_library');
+add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata' );