(bug 19591) Move setBigSelects() to DatabaseMysql

[lhc/web/wiklou.git] / includes / MediaTransformOutput.php

diff --git a/includes/MediaTransformOutput.php b/includes/MediaTransformOutput.php
index d620a58..e19a0c6 100644 (file)
--- a/includes/MediaTransformOutput.php
+++ b/includes/MediaTransformOutput.php
@@ -86,9 +86,6 @@ abstract class MediaTransformOutput {
                        $query .= $query ? '&'.$params : $params;
                }
                $title = $this->file->getTitle();
-               if ( strval( $alt ) === '' ) {
-                       $alt = $title->getText();
-               }
                return array(
                        'href' => $this->file->getTitle()->getLocalURL( $query ),
                        'class' => 'image',
@@ -153,14 +150,18 @@ class ThumbnailImage extends MediaTransformOutput {
                $alt = empty( $options['alt'] ) ? '' : $options['alt'];
                # Note: if title is empty and alt is not, make the title empty, don't
                # use alt; only use alt if title is not set
-               $title = !isset( $options['title'] ) ? $alt : $options['title'];                
+               $title = !isset( $options['title'] ) ? $alt : $options['title'];
                $query = empty($options['desc-query'])  ? '' : $options['desc-query'];
 
                if ( !empty( $options['custom-url-link'] ) ) {
                        $linkAttribs = array( 'href' => $options['custom-url-link'] );
+                       if ( $alt ) {
+                               $linkAttribs['title'] = $alt;
+                       }
                } elseif ( !empty( $options['custom-title-link'] ) ) {
                        $title = $options['custom-title-link'];
-                       $linkAttribs = array( 'href' => $title->getLinkUrl(), 'title' => $title->getFullText() );
+                       $linkAttribs = array( 'href' => $title->getLinkUrl(),
+                                       'title' => $alt );
                } elseif ( !empty( $options['desc-link'] ) ) {
                        $linkAttribs = $this->getDescLinkAttribs( $title, $query );
                } elseif ( !empty( $options['file-link'] ) ) {