From 92ed0ffbd6b65a767a12fb5d359045549afbb76c Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Fri, 22 Dec 2006 20:31:10 +0000
Subject: [PATCH] * (bug 532) Tweaked alt text for some interface messages *
 (bug 8231) Gave useful alt text to the main <img> on image pages * (bug 371)
 Remove alt text for "Enlarge" icon on thumbnails

---
 config/index.php       | 2 +-
 includes/Article.php   | 2 +-
 includes/ImagePage.php | 2 +-
 includes/Linker.php    | 2 +-
 includes/Skin.php      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/index.php b/config/index.php
index 0dab6b98b5..d6cbf8e95c 100644
--- a/config/index.php
+++ b/config/index.php
@@ -1032,7 +1032,7 @@ if( count( $errs ) ) {
 			?>
 		<?php if( $conf->License == "cc" ) { ?>
 			<ul>
-				<li><?php aField( $conf, "RightsIcon", "<img src=\"" . htmlspecialchars( $conf->RightsIcon ) . "\" alt='icon' />", "hidden" ); ?></li>
+				<li><?php aField( $conf, "RightsIcon", "<img src=\"" . htmlspecialchars( $conf->RightsIcon ) . "\" alt='(Creative Commons icon)' />", "hidden" ); ?></li>
 				<li><?php aField( $conf, "RightsText", htmlspecialchars( $conf->RightsText ), "hidden" ); ?></li>
 				<li><?php aField( $conf, "RightsCode", "code: " . htmlspecialchars( $conf->RightsCode ), "hidden" ); ?></li>
 				<li><?php aField( $conf, "RightsUrl", "<a href=\"" . htmlspecialchars( $conf->RightsUrl ) . "\">" . htmlspecialchars( $conf->RightsUrl ) . "</a>", "hidden" ); ?></li>
diff --git a/includes/Article.php b/includes/Article.php
index ebcb048978..bb698f7d1e 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -786,7 +786,7 @@ class Article {
 				}
 				$link = $sk->makeLinkObj( $rt, $rt->getFullText() );
 
-				$wgOut->addHTML( '<img src="'.$imageUrl.'" alt="#REDIRECT" />' .
+				$wgOut->addHTML( '<img src="'.$imageUrl.'" alt="#REDIRECT " />' .
 				  '<span class="redirectText">'.$link.'</span>' );
 
 				$parseout = $wgParser->parse($text, $this->mTitle, ParserOptions::newFromUser($wgUser));
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 10e9995721..43b9913073 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -244,7 +244,7 @@ class ImagePage extends Article {
 
 				$wgOut->addHTML( '<div class="fullImageLink" id="file">' . $anchoropen .
 				     "<img border=\"0\" src=\"{$url}\" width=\"{$width}\" height=\"{$height}\" alt=\"" .
-				     htmlspecialchars( $wgRequest->getVal( 'image' ) ).'" />' . $anchorclose . '</div>' );
+				     htmlspecialchars( $this->img->getTitle()->getPrefixedText() ).'" />' . $anchorclose . '</div>' );
 
 				if ( $this->img->isMultipage() ) {
 					$count = $this->img->pageCount();
diff --git a/includes/Linker.php b/includes/Linker.php
index ad2f098bf2..33e26cc02b 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -631,7 +631,7 @@ class Linker {
 				$zoomicon =  '<div class="magnify" style="float:'.$magnifyalign.'">'.
 					'<a href="'.$u.'" class="internal" title="'.$more.'">'.
 					'<img src="'.$wgStylePath.'/common/images/magnify-clip.png" ' .
-					'width="15" height="11" alt="'.$more.'" /></a></div>';
+					'width="15" height="11" alt="" /></a></div>';
 			}
 		}
 		$s .= '  <div class="thumbcaption"'.$textalign.'>'.$zoomicon.$label."</div></div></div>";
diff --git a/includes/Skin.php b/includes/Skin.php
index fd15d5929e..1b5b0f21f0 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1102,7 +1102,7 @@ END;
 	function getPoweredBy() {
 		global $wgStylePath;
 		$url = htmlspecialchars( "$wgStylePath/common/images/poweredby_mediawiki_88x31.png" );
-		$img = '<a href="http://www.mediawiki.org/"><img src="'.$url.'" alt="MediaWiki" /></a>';
+		$img = '<a href="http://www.mediawiki.org/"><img src="'.$url.'" alt="Powered by MediaWiki" /></a>';
 		return $img;
 	}
 
-- 
2.20.1