diff options
Diffstat (limited to 'includes/ImageGallery.php')
| -rw-r--r-- | includes/ImageGallery.php | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php index 4d5f067c..1106124a 100644 --- a/includes/ImageGallery.php +++ b/includes/ImageGallery.php @@ -28,9 +28,9 @@ class ImageGallery { * Contextual title, used when images are being screened * against the bad image list */ - private $contextTitle = false; + protected $contextTitle = false; - private $mAttribs = array(); + protected $mAttribs = array(); /** * Fixed margins @@ -131,7 +131,7 @@ class ImageGallery { * @deprecated since 1.18 Not used anymore */ function useSkin( $skin ) { - wfDeprecated( __METHOD__ ); + wfDeprecated( __METHOD__, '1.18' ); /* no op */ } @@ -249,11 +249,11 @@ class ImageGallery { # Get the file... if ( $this->mParser instanceof Parser ) { # Give extensions a chance to select the file revision for us - $time = $sha1 = false; + $options = array(); wfRunHooks( 'BeforeParserFetchFileAndTitle', - array( $this->mParser, $nt, &$time, &$sha1, &$descQuery ) ); + array( $this->mParser, $nt, &$options, &$descQuery ) ); # Fetch and register the file (file title may be different via hooks) - list( $img, $nt ) = $this->mParser->fetchFileAndTitle( $nt, $time, $sha1 ); + list( $img, $nt ) = $this->mParser->fetchFileAndTitle( $nt, $options ); } else { $img = wfFindFile( $nt ); } @@ -314,8 +314,7 @@ class ImageGallery { if( $this->mShowBytes ) { if( $img ) { - $fileSize = wfMsgExt( 'nbytes', array( 'parsemag', 'escape'), - $wgLang->formatNum( $img->getSize() ) ); + $fileSize = htmlspecialchars( $wgLang->formatSize( $img->getSize() ) ); } else { $fileSize = wfMsgHtml( 'filemissing' ); } |