Ticket #10939: 10939.patch

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

@@ -903 +903 @@
                 if( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
                         show_message(__('Attempting reactivation of the plugin'));
                         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>';
+                        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.'));
                 }
                 $update_actions =  array(
                         '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

@@ -127 +127 @@
         <?php
                 if ( wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $file) ) { ?>
         <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>
+        <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>
         <?php } ?>
 </div>
 <?php endif; ?>

wp-admin/plugins.php

@@ -245 +245 @@
         <?php
                 if ( wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $plugin) ) { ?>
         <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>
+        <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>       
         <?php
                 }
         ?>

wp-includes/js/thickbox/thickbox.js

@@ -76 +76 @@
                         TB_NextHTML = "";
                         TB_imageCount = "";
                         TB_FoundURL = false;
+                        // TODO TB_Noframes = "This feature needs inline frames (iframe) enabled which your browser currently does not support or is deactivated because of security considerations.";
                         if(imageGroup){
                                 TB_TempArray = jQuery("a[rel="+imageGroup+"]").get();
                                 for (TB_Counter = 0; ((TB_Counter < TB_TempArray.length) && (TB_NextHTML === "")); TB_Counter++) {
@@ -198 +199 @@
                                         }else{//iframe modal
                                         jQuery("#TB_overlay").unbind();
                                                 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>");
+                                                // TODO jQuery("#TB_window").append("<noframes>"+TB_Noframes+"</noframe>");
                                         }
                         }else{// not an iframe, ajax
                                         if(jQuery("#TB_window").css("display") != "block"){