Changeset 10476 for trunk/wp-admin/includes/template.php

Timestamp:

02/01/2009 09:45:24 AM (16 years ago)

Author:

azaozz

Message:

Detect when the server compresses output, see #8628

File:

• trunk/wp-admin/includes/template.php (modified) (8 diffs)

trunk/wp-admin/includes/template.php

@@ -1817 +1817 @@
     $numposts = get_usernumposts( $user_object->ID );
     $checkbox = '';
-    // Check if the user for this row is editable 
+    // Check if the user for this row is editable
     if ( current_user_can( 'edit_user', $user_object->ID ) ) {
-        // Set up the user editing link 
+        // Set up the user editing link
         // TODO: make profile/user-edit determination a seperate function
         if ($current_user->ID == $user_object->ID) {
@@ -1827 +1827 @@
         }
         $edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
-        
+
         // Set up the hover actions for this user
         $actions = array();
@@ -1842 +1842 @@
         }
         $edit .= '</div>';
-        
+
         // Set up the checkbox (because the user is editable, otherwise its empty)
         $checkbox = "<input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' />";
-        
+
     } else {
         $edit = '<strong>' . $user_object->user_login . '</strong>';
@@ -1923 +1923 @@
     $count = wp_count_comments();
     $index = '';
-    
+
     if ( 'moderated' == $status ) {
         $approved = "comment_approved = '0'";
@@ -2616 +2616 @@
 }
 
- 
+
 /**
  * Print out <option> html elements for role selectors based on $wp_roles
@@ -2631 +2631 @@
     $p = '';
     $r = '';
-    
+
     $editable_roles = get_editable_roles();
-    
+
     foreach( $editable_roles as $role => $details ) {
         $name = translate_with_context($details['name']);
@@ -3403 +3403 @@
  * and sets an option with the result. Has no effect when the current user
  * is not an administrator. To run the test again the option 'can_compress_scripts'
- * has to be deleted. 
+ * has to be deleted.
  *
  * @since 2.8.0
@@ -3409 +3409 @@
 function compression_test() {
 ?>
-    <script type="text/javascript" src="load-scripts.php?test=1<?php echo ( defined('ENFORCE_GZIP') && ENFORCE_GZIP ) ? '&c=gzip' : ''; ?>"></script>
     <script type="text/javascript">
     /* <![CDATA[ */
-    (function() {
-        var x, test = typeof wpCompressionTest == 'undefined' ? 0 : 1;
-        if ( window.XMLHttpRequest ) {
-            x = new XMLHttpRequest();
-        } else {
-            try{x=new ActiveXObject('Msxml2.XMLHTTP');}catch(e){try{x=new ActiveXObject('Microsoft.XMLHTTP');}catch(e){};}
+    var testCompression = {
+        get : function(test) {
+            var x;
+            if ( window.XMLHttpRequest ) {
+                x = new XMLHttpRequest();
+            } else {
+                try{x=new ActiveXObject('Msxml2.XMLHTTP');}catch(e){try{x=new ActiveXObject('Microsoft.XMLHTTP');}catch(e){};}
+            }
+
+            if (x) {
+                x.onreadystatechange = function() {
+                    var r, h;
+                    if ( x.readyState == 4 ) {
+                        r = x.responseText.substr(0, 18);
+                        h = x.getResponseHeader('Content-Encoding');
+                        testCompression.check(r, h, test);
+                    }
+                }
+
+                x.open('GET', 'admin-ajax.php?action=wp-compression-test&test='+test+'&'+(new Date()).getTime(), true);
+                x.send('');
+            }
+        },
+
+        check : function(r, h, test) {
+            if ( ! r && ! test )
+                this.get(1);
+
+            if ( 1 == test ) {
+                if ( h && ( h.match(/deflate/i) || h.match(/gzip/i) ) )
+                    this.get('no');
+                else
+                    this.get(2);
+
+                return;
+            }
+
+            if ( 2 == test ) {
+                if ( '"wpCompressionTest' == r )
+                    this.get('yes');
+                else
+                    this.get('no');
+            }
         }
-    
-        if (x) {
-            x.open('GET', 'admin-ajax.php?action=wp-compression-test&tested='+test+'&'+(new Date()).getTime(), true);
-            x.send('');
-        }
-    })();
+    };
+    testCompression.check();
     /* ]]> */
     </script>