Merge "Correct the plural forms for Manx (Gaelg)"

[lhc/web/wiklou.git] / includes / media / Jpeg.php

diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php
index ccbd544..ee7eff8 100644 (file)
--- a/includes/media/Jpeg.php
+++ b/includes/media/Jpeg.php
@@ -42,7 +42,8 @@ class JpegHandler extends ExifBitmapHandler {
 
                        return serialize( $meta );
                } catch ( MWException $e ) {
-                       // BitmapMetadataHandler throws an exception in certain exceptional cases like if file does not exist.
+                       // BitmapMetadataHandler throws an exception in certain exceptional
+                       // cases like if file does not exist.
                        wfDebug( __METHOD__ . ': ' . $e->getMessage() . "\n" );
 
                        /* This used to use 0 (ExifBitmapHandler::OLD_BROKEN_FILE) for the cases
@@ -60,7 +61,7 @@ class JpegHandler extends ExifBitmapHandler {
        }
 
        /**
-        * @param $file File
+        * @param File $file
         * @param array $params Rotate parameters.
         *    'rotation' clockwise rotation in degrees, allowed are multiples of 90
         * @since 1.21
@@ -79,6 +80,7 @@ class JpegHandler extends ExifBitmapHandler {
                        wfDebug( __METHOD__ . ": running jpgtran: $cmd\n" );
                        wfProfileIn( 'jpegtran' );
                        $retval = 0;
+                       // @todo FIXME Undefined variable $env
                        $err = wfShellExecWithStderr( $cmd, $retval, $env );
                        wfProfileOut( 'jpegtran' );
                        if ( $retval !== 0 ) {