Merge "Followup a88df43d: make $wgDebugDumpSql log commented queries again"

[lhc/web/wiklou.git] / includes / libs / IEContentAnalyzer.php

diff --git a/includes/libs/IEContentAnalyzer.php b/includes/libs/IEContentAnalyzer.php
index fae06ad..c31a352 100644 (file)
--- a/includes/libs/IEContentAnalyzer.php
+++ b/includes/libs/IEContentAnalyzer.php
@@ -329,11 +329,11 @@ class IEContentAnalyzer {
         * Get the MIME types from getMimesFromData(), but convert the result from IE's
         * idiosyncratic private types into something other apps will understand.
         *
-        * @param $fileName String: the file name (unused at present)
-        * @param $chunk String: the first 256 bytes of the file
-        * @param $proposed String: the MIME type proposed by the server
+        * @param string $fileName the file name (unused at present)
+        * @param string $chunk the first 256 bytes of the file
+        * @param string $proposed the MIME type proposed by the server
         *
-        * @return Array: map of IE version to detected mime type
+        * @return Array: map of IE version to detected MIME type
         */
        public function getRealMimesFromData( $fileName, $chunk, $proposed ) {
                $types = $this->getMimesFromData( $fileName, $chunk, $proposed );
@@ -367,11 +367,11 @@ class IEContentAnalyzer {
        /**
         * Get the untranslated MIME types for all known versions
         *
-        * @param $fileName String: the file name (unused at present)
-        * @param $chunk String: the first 256 bytes of the file
-        * @param $proposed String: the MIME type proposed by the server
+        * @param string $fileName the file name (unused at present)
+        * @param string $chunk the first 256 bytes of the file
+        * @param string $proposed the MIME type proposed by the server
         *
-        * @return Array: map of IE version to detected mime type
+        * @return Array: map of IE version to detected MIME type
         */
        public function getMimesFromData( $fileName, $chunk, $proposed ) {
                $types = array();
@@ -712,8 +712,9 @@ class IEContentAnalyzer {
                $xbmMagic2 = '_width';
                $xbmMagic3 = '_bits';
                $binhexMagic = 'converted with BinHex';
+               $chunkLength = strlen( $chunk );
 
-               for ( $offset = 0; $offset < strlen( $chunk ); $offset++ ) {
+               for ( $offset = 0; $offset < $chunkLength; $offset++ ) {
                        $curChar = $chunk[$offset];
                        if ( $curChar == "\x0a" ) {
                                $counters['lf']++;