WordPress.org
Get WordPress

Make WordPress Core

Ticket #58464: 58464-2.diff

File 58464-2.diff, 2.9 KB (added by nihar007, 20 months ago)

This is the final one

  • src/js/_enqueues/vendor/jquery/ui/mouse.js 

    diff --git a/src/js/_enqueues/vendor/jquery/ui/mouse.js b/src/js/_enqueues/vendor/jquery/ui/mouse.js
index ab770da605..7410de0234 100644
    a b return $.widget( "ui.mouse", { 
    223223                return this.mouseDelayMet;
    224224        },
    225225
    226         // These are placeholder methods, to be overriden by extending plugin
     226        // These are placeholder methods, to be overridden by extending plugin
    227227        _mouseStart: function( /* event */ ) {},
    228228        _mouseDrag: function( /* event */ ) {},
    229229        _mouseStop: function( /* event */ ) {},

  • src/js/_enqueues/vendor/plupload/moxie.js 

    diff --git a/src/js/_enqueues/vendor/plupload/moxie.js b/src/js/_enqueues/vendor/plupload/moxie.js
index c7d26f4c4e..766f0b12ad 100644
    a b define('moxie/core/EventTarget', [ 
    18301830                Basic.extend(this, {
    18311831                       
    18321832                        /**
    1833                         Unique id of the event dispatcher, usually overriden by children
     1833                        Unique id of the event dispatcher, usually overridden by children
    18341834
    18351835                        @property uid
    18361836                        @type String

  • src/wp-includes/ID3/module.audio.mp3.php 

    diff --git a/src/wp-includes/ID3/module.audio.mp3.php b/src/wp-includes/ID3/module.audio.mp3.php
index 3d8a9442a9..b7131eb61f 100644
    a b class getid3_mp3 extends getid3_handler 
    663663                                //116..119  VBR Scale
    664664
    665665
    666                                 // should be safe to leave this at 'vbr' and let it be overriden to 'cbr' if a CBR preset/mode is used by LAME
     666                                // should be safe to leave this at 'vbr' and let it be overridden to 'cbr' if a CBR preset/mode is used by LAME
    667667//                              if (substr($headerstring, $VBRidOffset, strlen('Info')) == 'Xing') {
    668668                                        $thisfile_mpeg_audio['bitrate_mode'] = 'vbr';
    669669                                        $thisfile_mpeg_audio['VBR_method']   = 'Xing';

  • src/wp-includes/class-wp-theme-json.php 

    diff --git a/src/wp-includes/class-wp-theme-json.php b/src/wp-includes/class-wp-theme-json.php
index f21a32fa41..ad51fa0a1a 100644
    a b class WP_Theme_JSON { 
    8080         * - prevent_override => Disables override of default presets by theme presets.
    8181         *                       The relationship between whether to override the defaults
    8282         *                       and whether the defaults are enabled is inverse:
    83          *                         - If defaults are enabled  => theme presets should not be overriden
    84          *                         - If defaults are disabled => theme presets should be overriden
     83         *                         - If defaults are enabled  => theme presets should not be overridden
     84         *                         - If defaults are disabled => theme presets should be overridden
    8585         *                       For example, a theme sets defaultPalette to false,
    8686         *                       making the default palette hidden from the user.
    8787         *                       In that case, we want all the theme presets to be present,