← Back to branch summary

~canonical-sysadmins/wordpress/4.9.4

« back to all changes in this revision

Viewing changes to wp-admin/js/updates.js

  • Committer: Barry Price
  • Date: 2017-05-17 04:15:55 UTC
  • mfrom: (1.1.25 upstream)
  • Revision ID: barry.price@canonical.com-20170517041555-7m1fj11y429dsu9n
Merge WP4.7.5 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-admin/js/updates.js
94
94
         * @type {object} filesystemCredentials.ssh                Holds SSH credentials.
95
95
         * @type {string} filesystemCredentials.ssh.publicKey      The public key. Default empty string.
96
96
         * @type {string} filesystemCredentials.ssh.privateKey     The private key. Default empty string.
 
97
         * @type {string} filesystemCredentials.fsNonce            Filesystem credentials form nonce.
97
98
         * @type {bool}   filesystemCredentials.available          Whether filesystem credentials have been provided.
98
99
         *                                                         Default 'false'.
99
100
         */
108
109
                        publicKey:  '',
109
110
                        privateKey: ''
110
111
                },
 
112
                fsNonce: '',
111
113
                available: false
112
114
        };
113
115
 
225
227
                options.data = _.extend( data, {
226
228
                        action:          action,
227
229
                        _ajax_nonce:     wp.updates.ajaxNonce,
 
230
                        _fs_nonce:       wp.updates.filesystemCredentials.fsNonce,
228
231
                        username:        wp.updates.filesystemCredentials.ftp.username,
229
232
                        password:        wp.updates.filesystemCredentials.ftp.password,
230
233
                        hostname:        wp.updates.filesystemCredentials.ftp.hostname,
1705
1708
                        wp.updates.filesystemCredentials.ftp.connectionType = $( 'input[name="connection_type"]:checked' ).val();
1706
1709
                        wp.updates.filesystemCredentials.ssh.publicKey      = $( '#public_key' ).val();
1707
1710
                        wp.updates.filesystemCredentials.ssh.privateKey     = $( '#private_key' ).val();
 
1711
                        wp.updates.filesystemCredentials.fsNonce            = $( '#_fs_nonce' ).val();
1708
1712
                        wp.updates.filesystemCredentials.available          = true;
1709
1713
 
1710
1714
                        // Unlock and invoke the queue.