X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Ffilebackend%2FFSFile.php;h=6311f766da78a7f4bcf7bbadee139d75dd62feb3;hb=c37912606510ceee79fdecb9cb1afdf1781b74ad;hp=213bb87dee365b79232dbb02562fe5de7f66e1bd;hpb=f0c8631a0f765917cf905846659efff1697943fd;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/filebackend/FSFile.php b/includes/filebackend/FSFile.php index 213bb87dee..6311f766da 100644 --- a/includes/filebackend/FSFile.php +++ b/includes/filebackend/FSFile.php @@ -131,7 +131,7 @@ class FSFile { # Height, width and metadata $handler = MediaHandler::getHandler( $info['mime'] ); if ( $handler ) { - $tempImage = (object)array(); // XXX (hack for File object) + $tempImage = (object)[]; // XXX (hack for File object) $info['metadata'] = $handler->getMetadata( $tempImage, $this->path ); $gis = $handler->getImageSize( $tempImage, $this->path, $info['metadata'] ); if ( is_array( $gis ) ) { @@ -154,7 +154,7 @@ class FSFile { * @return array */ public static function placeholderProps() { - $info = array(); + $info = []; $info['fileExists'] = false; $info['mime'] = null; $info['media_type'] = MEDIATYPE_UNKNOWN; @@ -174,7 +174,7 @@ class FSFile { * @return array */ protected function extractImageSizeInfo( array $gis ) { - $info = array(); + $info = []; # NOTE: $gis[2] contains a code for the image type. This is no longer used. $info['width'] = $gis[0]; $info['height'] = $gis[1]; @@ -208,7 +208,7 @@ class FSFile { MediaWiki\restoreWarnings(); if ( $this->sha1Base36 !== false ) { - $this->sha1Base36 = wfBaseConvert( $this->sha1Base36, 16, 36, 31 ); + $this->sha1Base36 = Wikimedia\base_convert( $this->sha1Base36, 16, 36, 31 ); } return $this->sha1Base36;