Ticket #7013: media.php.patch

media.php

@@ -158 +158 @@
  *
  * @param unknown_type $html
  */
-function media_send_to_editor($html) {
+function media_send_to_editor($html, $autoclose) {
 ?>
 <script type="text/javascript">
 /* <![CDATA[ */
@@ -167 +167 @@
 /* ]]> */
 </script>
 <?php
-        exit;
+    //var_dump($autoclose);
+    if ( $autoclose == true);
+           exit;
+
+    return;
 }
 
 /**
@@ -398 +402 @@
         check_admin_referer('media-form');
 
         $errors = null;
-
+    $autoclose = true;
+    
+    if ( isset($_POST['autoclose']) && empty( $_POST['autoclose']) )
+        $autoclose = false;
+    //var_dump($autoclose);
+    
         if ( isset($_POST['send']) ) {
                 $keys = array_keys($_POST['send']);
                 $send_id = (int) array_shift($keys);
         }
 
+    
         if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
                 $post = $_post = get_post($attachment_id, ARRAY_A);
                 if ( isset($attachment['post_content']) )
@@ -468 +478 @@
                 }
 
                 $html = apply_filters('media_send_to_editor', $html, $send_id, $attachment);
-                return media_send_to_editor($html);
+                return media_send_to_editor($html, $autoclose);
         }
 
         return $errors;
@@ -485 +495 @@
         $errors = array();
         $id = 0;
 
+    
         if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
                 // Upload File button was clicked
                 $id = media_handle_upload('async-upload', $_REQUEST['post_id']);
@@ -510 +521 @@
                         $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, $autoclose);
         }
 
         if ( !empty($_POST) ) {
@@ -1366 +1377 @@
         <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
 }
@@ -1426 +1438 @@
 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; }',
-                        button_height: "24",
+                        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: 2,
+                        button_text_top_padding: 3,
                         button_image_url: '<?php echo includes_url('images/upload.png'); ?>',
                         button_placeholder_id: "flash-browse-button",
                         upload_url : "<?php echo esc_attr( $flash_action_url ); ?>",
@@ -1516 +1528 @@
 ?>
 
 <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">
+<div id="autoclose"><input type="checkbox" checked="checked" name="autoclose" /> Autoclose</div> 
 <input type="submit" class="hidden" name="save" value="" />
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
 <?php wp_nonce_field('media-form'); ?>