Follow-up r110761: removed duplicate check of $wgShowIPinHeader and fix some whitespaces

diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php
index 6b19fdf..5e9d812 100644 (file)
--- a/includes/cache/HTMLFileCache.php
+++ b/includes/cache/HTMLFileCache.php
@@ -65,8 +65,8 @@ class HTMLFileCache extends FileCacheBase {
                if ( !$wgUseFileCache ) {
                        return false;
                }
-               if( $wgShowIPinHeader || $wgDebugToolbar ) {
-                       wfDebug("HTML file cache skipped. Either \$wgShowIPinHeader and/or \$wgDebugToolbar on\n" );
+               if ( $wgShowIPinHeader || $wgDebugToolbar ) {
+                       wfDebug( "HTML file cache skipped. Either \$wgShowIPinHeader and/or \$wgDebugToolbar on\n" );
                        return false;
                }
 
@@ -90,7 +90,7 @@ class HTMLFileCache extends FileCacheBase {
                $ulang = $context->getLanguage()->getCode();
                $clang = $wgContLang->getCode();
                // Check that there are no other sources of variation
-               return !$wgShowIPinHeader && !$user->getId() && !$user->getNewtalk() && $ulang == $clang;
+               return !$user->getId() && !$user->getNewtalk() && $ulang == $clang;
        }
 
        /**