Merge "Skin: Make skins aware of their registered skin name"

[lhc/web/wiklou.git] / includes / filerepo / file / File.php

diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index 9aa2b18..32f4504 100644 (file)
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -355,7 +355,7 @@ abstract class File implements IDBAccessObject {
                return $this->url;
        }
 
-       /*
+       /**
         * Get short description URL for a files based on the page ID
         *
         * @return string|null
@@ -862,7 +862,7 @@ abstract class File implements IDBAccessObject {
         *
         * Overridden by LocalFile to actually query the DB
         *
-        * @param integer $flags Bitfield of File::READ_* constants
+        * @param int $flags Bitfield of File::READ_* constants
         */
        public function load( $flags = 0 ) {
        }
@@ -1147,7 +1147,7 @@ abstract class File implements IDBAccessObject {
                if ( !$thumb ) { // bad params?
                        $thumb = false;
                } elseif ( $thumb->isError() ) { // transform error
-                       /** @var $thumb MediaTransformError */
+                       /** @var MediaTransformError $thumb */
                        $this->lastError = $thumb->toText();
                        // Ignore errors if requested
                        if ( $wgIgnoreImageErrors && !( $flags & self::RENDER_NOW ) ) {
@@ -1282,11 +1282,10 @@ abstract class File implements IDBAccessObject {
                // Thumbnailing a very large file could result in network saturation if
                // everyone does it at once.
                if ( $this->getSize() >= 1e7 ) { // 10MB
-                       $that = $this;
                        $work = new PoolCounterWorkViaCallback( 'GetLocalFileCopy', sha1( $this->getName() ),
                                [
-                                       'doWork' => function () use ( $that ) {
-                                               return $that->getLocalRefPath();
+                                       'doWork' => function () {
+                                               return $this->getLocalRefPath();
                                        }
                                ]
                        );