Reconcept cl_raw_sortkey as cl_sortkey_prefix

[lhc/web/wiklou.git] / includes / OutputHandler.php
diff --git a/includes/OutputHandler.php b/includes/OutputHandler.php

index 72e6562..91819cc 100644 (file)
--- a/includes/OutputHandler.php
+++ b/includes/OutputHandler.php
@@ -90,7 +90,10 @@ function wfGzipHandler( $s ) {
         }
         if ( !$foundVary ) {
                 header( 'Vary: Accept-Encoding' );
-               header( 'X-Vary-Options: Accept-Encoding;list-contains=gzip' );
+               global $wgUseXVO;
+               if ( $wgUseXVO ) {
+                       header( 'X-Vary-Options: Accept-Encoding;list-contains=gzip' );
+               }
         }
         return $s;
  }
@@ -130,7 +133,7 @@ function wfHtmlValidationHandler( $s ) {
  
         $out = <<<EOT
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" dir="ltr">
  <head>
  <title>HTML validation error</title>
  <style>