Changeset 7682

Timestamp:

04/14/2008 11:09:14 PM (17 years ago)

Author:

ryan

Message:

Workaround response truncation by reducing size of response after uploading with flash uploader. Props tellyworth. fixes #6713

Location:

trunk

Files:

• wp-admin/async-upload.php (modified) (2 diffs)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-includes/js/swfupload/handlers.js (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/async-upload.php

@@ -21 +21 @@
     wp_die(__('You do not have permission to upload files.'));
 
+// just fetch the detail form for that attachment   
+if ( ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
+    echo get_media_item($id);
+    exit;
+}
+
 $id = media_handle_upload('async-upload', $_REQUEST['post_id']);
 if (is_wp_error($id)) {
@@ -27 +33 @@
 }
 
-$type = $_REQUEST['type'];
-echo apply_filters("async_upload_{$type}", $id);
+if ( $_REQUEST['short'] ) {
+    // short form response - attachment ID only
+    echo $id;
+}
+else {
+    // long form response - big chunk o html
+    $type = $_REQUEST['type'];
+    echo apply_filters("async_upload_{$type}", $id);
+}
 
 ?>

trunk/wp-admin/includes/media.php

@@ -805 +805 @@
                 "auth_cookie" : "<?php echo $_COOKIE[AUTH_COOKIE]; ?>",
                 "type" : "<?php echo $type; ?>",
-                "tab" : "<?php echo $tab; ?>"
+                "tab" : "<?php echo $tab; ?>",
+                "short" : "1"
             },
             file_size_limit : "<?php echo wp_max_upload_size(); ?>b",

trunk/wp-includes/js/swfupload/handlers.js

@@ -36 +36 @@
     jQuery('#media-item-' + fileObj.id + ' .progress').hide();
 
-    // Append the HTML returned by the server -- thumbnail and form inputs
-    jQuery('#media-item-' + fileObj.id).append(serverData);
+    // Old style: Append the HTML returned by the server -- thumbnail and form inputs
+    if ( isNaN(serverData) || !serverData ) {
+        jQuery('#media-item-' + fileObj.id).append(serverData);
+        prepareMediaItemInit(fileObj);
+    }
+    // New style: server data is just the attachment ID, fetch the thumbnail and form html from the server
+    else {
+        jQuery('#media-item-' + fileObj.id).load('async-upload.php', {attachment_id:serverData, fetch:1}, function(){prepareMediaItemInit(fileObj);updateMediaForm()});
+    }
+}
+        
+function prepareMediaItemInit(fileObj) {
 
     // Clone the thumbnail as a "pinkynail" -- a tiny image to the left of the filename

trunk/wp-includes/script-loader.php

@@ -88 +88 @@
         ) );
         $this->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2.0.2');
-        $this->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.0.2-20080331');
+        $this->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.0.2-20080407');
         // these error messages came from the sample swfupload js, they might need changing.
         $this->localize( 'swfupload-handlers', 'swfuploadL10n', array(