-rakkaus/#mediawiki-i18n- (1 lines skipped) [06-Oct-2011 16:12:26] PHP Fatal error...
[lhc/web/wiklou.git] / includes / ImageGallery.php
index cc561b4..a40a685 100644 (file)
@@ -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
@@ -58,6 +58,8 @@ class ImageGallery {
 
        /**
         * Register a parser object
+        *
+        * @param $parser Parser
         */
        function setParser( $parser ) {
                $this->mParser = $parser;
@@ -219,7 +221,7 @@ class ImageGallery {
 
                if ( $this->mPerRow > 0 ) {
                        $maxwidth = $this->mPerRow * ( $this->mWidths + self::THUMB_PADDING + self::GB_PADDING + self::GB_BORDERS );
-                       $oldStyle = isset( $this->mAttribs['style'] ) ? $this->mAttribs['style'] : ''; 
+                       $oldStyle = isset( $this->mAttribs['style'] ) ? $this->mAttribs['style'] : '';
                        # _width is ignored by any sane browser. IE6 doesn't know max-width so it uses _width instead
                        $this->mAttribs['style'] = "max-width: {$maxwidth}px;_width: {$maxwidth}px;" . $oldStyle;
                }
@@ -247,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 );
                                }
@@ -279,10 +281,7 @@ class ImageGallery {
                                $thumbhtml = "\n\t\t\t" . '<div style="height: ' . ( self::THUMB_PADDING + $this->mHeights ) . 'px;">'
                                        . htmlspecialchars( $img->getLastError() ) . '</div>';
                        } else {
-                               # We get layout problems with the margin, if the image is smaller 
-                               # than the line-height (17), so we add less margin in these cases.
-                               $minThumbHeight =  $thumb->height > 17 ? $thumb->height : 17;
-                               $vpad = floor( ( self::THUMB_PADDING + $this->mHeights - $minThumbHeight ) /2 );
+                               $vpad = ( self::THUMB_PADDING + $this->mHeights - $thumb->height ) /2;
 
                                $imageParameters = array(
                                        'desc-link' => true,