From 4897565a2e3eeda58e277f9a0b26f08a6534c3ac Mon Sep 17 00:00:00 2001
From: Jens Frank <jeluf@users.mediawiki.org>
Date: Sun, 7 Mar 2004 19:40:58 +0000
Subject: [PATCH] Create an error warning for thumbnails of non-existing images

---
 includes/Skin.php        | 44 ++++++++++++++++++++++++++++++----------
 languages/Language.php   |  3 ++-
 languages/LanguageDe.php |  1 +
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/includes/Skin.php b/includes/Skin.php
index 306e81296a..f57466cb14 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1524,8 +1524,13 @@ class Skin {
 		$alt = htmlspecialchars( $alt );
 
 		$u = $nt->escapeLocalURL();
-		$s = "<a href=\"{$u}\" class='image' title=\"{$alt}\">" .
-		  "<img border=\"0\" src=\"{$url}\" alt=\"{$alt}\"></a>";
+		if ( $url == "" )
+		{
+			$s = str_replace( "$1", $name, wfMsg("missingimage") );
+		} else {
+			$s = "<a href=\"{$u}\" class='image' title=\"{$alt}\">" .
+				"<img border=\"0\" src=\"{$url}\" alt=\"{$alt}\"></a>";
+		}
 		if ( "" != $align ) {
 			$s = "<div class=\"float{$align}\">{$s}</div>";
 		}
@@ -1542,7 +1547,13 @@ class Skin {
 		$thumbPath = wfImageThumbDir( $thumbName )."/".$thumbName;
 		$thumbUrl  = wfImageThumbUrl( $thumbName );
 
-		if (     (! file_exists( $thumbPath ) && file_exists( $imgPath )) 
+		if ( ! file_exists( $imgPath ) )
+		{
+			# If there is no image, there will be no thumbnail
+			return "";
+		}
+
+		if (     (! file_exists( $thumbPath ) )
 		||  ( filemtime($thumbPath) < filemtime($imgPath) ) ) {
 			# Squid purging
 			if ( $wgUseSquid ) {
@@ -1639,7 +1650,12 @@ class Skin {
 		$alt = preg_replace( "/<[^>]*>/", "", $label);
 		$alt = htmlspecialchars( $alt );
 		
-		list($width, $height, $type, $attr) = getimagesize( $path );
+		if ( file_exists( $path ) )
+		{
+			list($width, $height, $type, $attr) = getimagesize( $path );
+		} else {
+			$width = $height = 200;
+		}
 		$boxheight  = intval( $height/($width/$boxwidth) );
 		if ( $boxwidth > $width ) {
 			$boxwidth  = $width;
@@ -1651,13 +1667,19 @@ class Skin {
 		$u = $nt->escapeLocalURL();
 
 		$more = htmlspecialchars(wfMsg( "thumbnail-more" ));
-		
-		$s = "<div class=\"thumbnail-{$align}\" style=\"width:{$boxwidth}px;\">" .
-		  "<a href=\"{$u}\" class=\"internal\" title=\"{$alt}\">" .
-		  "<img border=\"0\" src=\"{$thumbUrl}\" alt=\"{$alt}\" width=\"{$boxwidth}\" height=\"{$boxheight}\"></a>" .
-		  "<a href=\"{$u}\" class=\"internal\" title=\"{$more}\">" .
-		    "<img border=\"0\" src=\"{$wgUploadPath}/magnify-clip.png\" width=\"26\" height=\"24\" align=\"right\" alt=\"{$more}\"></a>" .
-		  "<p>{$label}</p></div>";
+
+		$s = "<div class=\"thumbnail-{$align}\" style=\"width:{$boxwidth}px;\">";
+		if ( $thumbUrl == "" ) {
+			$s .= str_replace( "$1", $name, wfMsg("missingimage") );
+		} else {
+		  	$s .= "<a href=\"{$u}\" class=\"internal\" title=\"{$alt}\">" .
+		  		"<img border=\"0\" src=\"{$thumbUrl}\" alt=\"{$alt}\" " .
+				"  width=\"{$boxwidth}\" height=\"{$boxheight}\"></a>" .
+		  		"<a href=\"{$u}\" class=\"internal\" title=\"{$more}\">" .
+		    		"<img border=\"0\" src=\"{$wgUploadPath}/magnify-clip.png\" " .
+				"  width=\"26\" height=\"24\" align=\"right\" alt=\"{$more}\"></a>";
+		}
+		$s .= "<p>{$label}</p></div>";
 		return $s;
 	}
 
diff --git a/languages/Language.php b/languages/Language.php
index fcd1371b75..49af2bcaca 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1396,7 +1396,8 @@ amusement.",
 
 # Thumbnails
 
-"thumbnail-more"      => "Enlarge"
+"thumbnail-more"	=> "Enlarge",
+"missingimage"		=> "<b>Missing image</b><br><i>$1</i>\n"
 
 
 );
diff --git a/languages/LanguageDe.php b/languages/LanguageDe.php
index 32decb3bac..f21f71dac2 100644
--- a/languages/LanguageDe.php
+++ b/languages/LanguageDe.php
@@ -907,6 +907,7 @@ Diskussions-Seite nicht, da schon eine mit dem neuen Titel existiert. Bitte glei
 "export"        => "Seiten exportieren",
 "exporttext"    => "Sie können den Text und die Bearbeitungshistorie einer bestimmten oder einer Auswahl von Seiten nach XML exportieren. Das Ergebnis kann in ein anderes Wiki mit WikiMedia Software eingespielt werden, bearbeitet oder archiviert werden.",
 "exportcuronly" => "Nur die aktuelle Version der Seite exportieren",
+"missingimage"          => "<b>Fehlendes Bild</b><br><i>$1</i>\n"
 );
 class LanguageDe extends Language {
 
-- 
2.20.1