← Back to branch summary

~ubuntu-branches/debian/sid/wordpress/sid

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Raphaël Hertzog
  • Date: 2013-09-04 23:18:58 UTC
  • mfrom: (1.2.28)
  • Revision ID: package-import@ubuntu.com-20130904231858-nljmn1buzswh63jk
Tags: 3.6+dfsg-1
* New upstream release.
* Improve wp-settings to verify that $_SERVER['HTTP_X_FORWARDED_PROTO']
  exists before accessing it (avoids a PHP notice).
  Thanks to Paul Dreik <slask@pauldreik.se> for the report and the patch.
* Document in README.Debian the need to login to /wp-admin/ to complete
  an upgrade.
* Drop useless debian/README.source
* Drop 008CVE2008-2392.patch since upstream now disables unfiltered
  uploads by default. See http://core.trac.wordpress.org/ticket/10692
* Drop 009CVE2008-6767.patch since the backto parameter is validated
  against a whitelist, and externally triggered upgrades are not a
  security problem as long as they work.
* Update debian/missing-sources with latest versions.
* Update upstream l10n.

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-admin/js/editor.js
49
49
                        if ( ed && ed.isHidden() )
50
50
                                return false;
51
51
 
52
 
                        if ( ed )
 
52
                        if ( ed ) {
53
53
                                ed.hide();
 
54
                        } else {
 
55
                                // The TinyMCE instance doesn't exist, run the content through "pre_wpautop()" and show the textarea
 
56
                                if ( tinyMCEPreInit.mceInit[id] && tinyMCEPreInit.mceInit[id].wpautop )
 
57
                                        txtarea_el.value = t.pre_wpautop( txtarea_el.value );
 
58
 
 
59
                                dom.setStyles(txtarea_el, {'display': '', 'visibility': ''});
 
60
                        }
54
61
 
55
62
                        dom.removeClass(wrap_id, 'tmce-active');
56
63
                        dom.addClass(wrap_id, 'html-active');
138
145
 
139
146
        _wp_Autop : function(pee) {
140
147
                var preserve_linebreaks = false, preserve_br = false,
141
 
                        blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|option|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|samp|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary';
 
148
                        blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|option|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary';
142
149
 
143
150
                if ( pee.indexOf('<object') != -1 ) {
144
151
                        pee = pee.replace(/<object[\s\S]+?<\/object>/g, function(a){