Ticket #22552: 22552-3.patch

wp-admin/includes/ajax-actions.php

@@ -1582 +1582 @@
 }
 
 function wp_ajax_upload_attachment() {
+        nocache_headers();
         check_ajax_referer( 'media-form' );
 
         if ( ! current_user_can( 'upload_files' ) )

wp-admin/includes/media.php

@@ -1508 +1508 @@
         '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 );
 
 ?>

wp-includes/functions.php

@@ -2273 +2273 @@
  * @param mixed $response Variable (usually an array or object) to encode as JSON, then print and die.
  */
 function wp_send_json( $response ) {
+        nocache_headers();
         @header( 'Content-Type: application/json; charset=' . get_option( 'blog_charset' ) );
+
         echo json_encode( $response );
+
         if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
                 wp_die();
         else

wp-includes/js/media-models.js

@@ -789 +789 @@
                 }
         });
 
-}(jQuery));
- No newline at end of file
+        // Clean up. Prevents mobile browsers caching
+        $(window).on('unload', function(){
+                window.wp = null;
+        });
+
+}(jQuery));

wp-includes/media.php

@@ -1254 +1254 @@
                 'multipart'           => true,
                 'urlstream_upload'    => true,
         );
+        
+        // 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() )
+                $defaults['multi_selection'] = false;
 
         $defaults = apply_filters( 'plupload_default_settings', $defaults );