Ticket #6278: 6278.diff

wp-admin/includes/media.php

@@ -778 +778 @@
 
         $flash_action_url = get_option('siteurl') . "/wp-admin/async-upload.php";
 
+        // If Mac and mod_security, no Flash. :(
+        if ( false !== strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'mac') && 'on' == strtolower(apache_getenv('MODSEC_ENABLE')) )
+                $flash = false;
+        else
+                $flash = true;
+
         $post_id = intval($_REQUEST['post_id']);
 
 ?>
@@ -787 +793 @@
         <?php echo $errors['upload_error']->get_error_message(); ?>
 <?php } ?>
 </div>
+<?php if ( $flash ) : ?>
 <script type="text/javascript">
 <!--
 jQuery(function($){
@@ -828 +835 @@
         <p><?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></p>
 </div>
 
+<?php endif; // $flash ?>
+
 <div id="html-upload-ui">
         <p>
         <input type="file" name="async-upload" id="async-upload" /> <input type="submit" class="button" value="<?php echo attribute_escape(__('Upload')); ?>" /> <a href="#" onClick="return top.tb_remove();"><?php _e('Cancel'); ?></a>