diff options
Diffstat (limited to 'includes/ImageGallery.php')
-rw-r--r-- | includes/ImageGallery.php | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php index 46ecd169..492a3e06 100644 --- a/includes/ImageGallery.php +++ b/includes/ImageGallery.php @@ -3,14 +3,11 @@ if ( ! defined( 'MEDIAWIKI' ) ) die( 1 ); /** - */ - -/** * Image gallery * * Add images to the gallery using add(), then render that list to HTML using toHTML(). * - * @addtogroup Media + * @ingroup Media */ class ImageGallery { @@ -37,7 +34,7 @@ class ImageGallery private $mPerRow = 4; // How many images wide should the gallery be? private $mWidths = 120, $mHeights = 120; // How wide/tall each thumbnail should be - + private $mAttribs = array(); /** @@ -196,11 +193,11 @@ class ImageGallery function setShowFilename( $f ) { $this->mShowFilename = ( $f == true); } - + /** * Set arbitrary attributes to go on the HTML gallery output element. * Should be suitable for a <table> element. - * + * * Note -- if taking from user input, you should probably run through * Sanitizer::validateAttributes() first. * @@ -240,10 +237,10 @@ class ImageGallery foreach ( $this->mImages as $pair ) { $nt = $pair[0]; $text = $pair[1]; - + # Give extensions a chance to select the file revision for us - $time = false; - wfRunHooks( 'BeforeGalleryFindFile', array( &$this, &$nt, &$time ) ); + $time = $descQuery = false; + wfRunHooks( 'BeforeGalleryFindFile', array( &$this, &$nt, &$time, &$descQuery ) ); $img = wfFindFile( $nt, $time ); @@ -261,14 +258,14 @@ class ImageGallery . htmlspecialchars( $img->getLastError() ) . '</div>'; } else { $vpad = floor( ( 1.25*$this->mHeights - $thumb->height ) /2 ) - 2; - + $thumbhtml = "\n\t\t\t". '<div class="thumb" style="padding: ' . $vpad . 'px 0; width: ' .($this->mWidths+30).'px;">' # Auto-margin centering for block-level elements. Needed now that we have video # handlers since they may emit block-level elements as opposed to simple <img> tags. # ref http://css-discuss.incutio.com/?page=CenteringBlockElement . '<div style="margin-left: auto; margin-right: auto; width: ' .$this->mWidths.'px;">' - . $thumb->toHtml( array( 'desc-link' => true ) ) . '</div></div>'; + . $thumb->toHtml( array( 'desc-link' => true, 'desc-query' => $descQuery ) ) . '</div></div>'; // Call parser transform hook if ( $this->mParser && $img->getHandler() ) { @@ -277,7 +274,7 @@ class ImageGallery } //TODO - //$ul = $sk->makeLink( $wgContLang->getNsText( Namespace::getUser() ) . ":{$ut}", $ut ); + //$ul = $sk->makeLink( $wgContLang->getNsText( MWNamespace::getUser() ) . ":{$ut}", $ut ); if( $this->mShowBytes ) { if( $img ) { @@ -328,7 +325,7 @@ class ImageGallery public function count() { return count( $this->mImages ); } - + /** * Set the contextual title * @@ -337,7 +334,7 @@ class ImageGallery public function setContextTitle( $title ) { $this->contextTitle = $title; } - + /** * Get the contextual title, if applicable * @@ -350,5 +347,3 @@ class ImageGallery } } //class - - |