WordPress.org

Make WordPress Core

Ticket #10939: 10939.patch

File 10939.patch, 3.9 KB (added by hakre, 4 years ago)

First patch, still containing temporary code because of the visual editor is broken in my head testbed right now.

  • wp-admin/includes/class-wp-upgrader.php

    Property changes on: .
    ___________________________________________________________________
    Added: svn:ignore
       + wp-config.php
    
    
     
    903903                if( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){ 
    904904                        show_message(__('Attempting reactivation of the plugin')); 
    905905                        echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) .'"></iframe>'; 
     906                        printf( '<noframes>%s</noframes>', __('This feature needs inline frames (iframe) enabled which your browser currently does not support or is deactivated because of security considerations.')); 
    906907                } 
    907908                $update_actions =  array( 
    908909                        'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>', 
  • wp-admin/plugin-editor.php

     
    127127        <?php 
    128128                if ( wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $file) ) { ?> 
    129129        <iframe style="border:0" width="100%" height="70px" src="<?php bloginfo('wpurl'); ?>/wp-admin/plugins.php?action=error_scrape&amp;plugin=<?php echo esc_attr($file); ?>&amp;_wpnonce=<?php echo esc_attr($_GET['_error_nonce']); ?>"></iframe> 
     130        <noframes><?php _e('This feature needs inline frames (iframe) enabled which your browser currently does not support or is deactivated because of security considerations.') ?></noframes> 
    130131        <?php } ?> 
    131132</div> 
    132133<?php endif; ?> 
  • wp-admin/plugins.php

     
    245245        <?php 
    246246                if ( wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $plugin) ) { ?> 
    247247        <iframe style="border:0" width="100%" height="70px" src="<?php echo admin_url('plugins.php?action=error_scrape&amp;plugin=' . esc_attr($plugin) . '&amp;_wpnonce=' . esc_attr($_GET['_error_nonce'])); ?>"></iframe> 
     248        <noframes><?php _e('This feature needs inline frames (iframe) enabled which your browser currently does not support or is deactivated because of security considerations.') ?></noframes>        
    248249        <?php 
    249250                } 
    250251        ?> 
  • wp-includes/js/thickbox/thickbox.js

     
    7676                        TB_NextHTML = ""; 
    7777                        TB_imageCount = ""; 
    7878                        TB_FoundURL = false; 
     79                        // TODO TB_Noframes = "This feature needs inline frames (iframe) enabled which your browser currently does not support or is deactivated because of security considerations."; 
    7980                        if(imageGroup){ 
    8081                                TB_TempArray = jQuery("a[rel="+imageGroup+"]").get(); 
    8182                                for (TB_Counter = 0; ((TB_Counter < TB_TempArray.length) && (TB_NextHTML === "")); TB_Counter++) { 
     
    198199                                        }else{//iframe modal 
    199200                                        jQuery("#TB_overlay").unbind(); 
    200201                                                jQuery("#TB_window").append("<iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;'> </iframe>"); 
     202                                                // TODO jQuery("#TB_window").append("<noframes>"+TB_Noframes+"</noframe>"); 
    201203                                        } 
    202204                        }else{// not an iframe, ajax 
    203205                                        if(jQuery("#TB_window").css("display") != "block"){