Changeset 22865

Timestamp:

11/27/2012 02:58:08 PM (12 years ago)

Author:

ryan

Message:

Back compat $_REQUESTpost_id? for media XHR requests.

Props koopersmith, nacin.
fixes #22588

Location:

trunk/wp-includes

Files:

• js/media-editor.js (modified) (1 diff)
• js/media-models.js (modified) (3 diffs)
• js/media-views.js (modified) (1 diff)
• script-loader.php (modified) (1 diff)

trunk/wp-includes/js/media-editor.js

@@ -460 +460 @@
             link: function( embed ) {
                 return media.post( 'send-link-to-editor', {
-                    nonce: wp.media.view.settings.nonce.sendToEditor,
-                    src:   embed.linkUrl,
-                    title: embed.title,
-                    html:  wp.media.string.link( embed )
+                    nonce:   wp.media.view.settings.nonce.sendToEditor,
+                    src:     embed.linkUrl,
+                    title:   embed.title,
+                    html:    wp.media.string.link( embed ),
+                    post_id: wp.media.view.settings.postId
                 }).done( function( resp ) {
                     wp.media.editor.insert( resp );

trunk/wp-includes/js/media-models.js

@@ -236 +236 @@
                 // Set the action and ID.
                 options.data = _.extend( options.data || {}, {
-                    action: 'save-attachment',
-                    id:     this.id,
-                    nonce:  media.model.settings.saveAttachmentNonce
+                    action:  'save-attachment',
+                    id:      this.id,
+                    nonce:   media.model.settings.saveAttachmentNonce,
+                    post_id: media.model.settings.postId
                 });
 
@@ -269 +270 @@
 
             return media.post( 'save-attachment-compat', _.defaults({
-                id:     this.id,
-                nonce:  media.model.settings.saveAttachmentNonce
+                id:      this.id,
+                nonce:   media.model.settings.saveAttachmentNonce,
+                post_id: media.model.settings.postId
             }, data ) ).done( function( resp, status, xhr ) {
                 model.set( model.parse( resp, xhr ), options );
@@ -610 +612 @@
                 options.context = this;
                 options.data = _.extend( options.data || {}, {
-                    action: 'query-attachments'
+                    action:  'query-attachments',
+                    post_id: media.model.settings.postId
                 });
 

trunk/wp-includes/js/media-views.js

@@ -12 +12 @@
     media.view.settings = l10n.settings || {};
     delete l10n.settings;
+
+    // Copy the `postId` setting over to the model settings.
+    media.model.settings.postId = media.view.settings.postId;
 
     // Check if the browser supports CSS 3.0 transitions

trunk/wp-includes/script-loader.php

@@ -325 +325 @@
             'saveAttachmentNonce' => wp_create_nonce( 'save-attachment' ),
             'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ),
+            'postId'  => 0,
         ),
     ) );