Pass whether current rev of file exists to Linker::makeBrokenImageLinkObj

A $time parameter was added to Linker::makeBrokenImageLinkObj in 2d22c85
to avoid checking if a file exists if we were fetching the current
revision.  The assumption being that the method would only be called if
the current revision doesn't exist.  A new parameter is added to
indicate that the current revision exist so that a known link can be
created.

Bug: T329214
Change-Id: I9ae5b18c422ab7d1b2b3b599a1994c319fe37239

1 files changed, 14 insertions, 8 deletions

diff --git a/includes/linker/Linker.php b/includes/linker/Linker.php
index 763b207d5d2f..ddebd1c2b988 100644
--- a/includes/linker/Linker.php
+++ b/includes/linker/Linker.php
@@ -469,13 +469,18 @@ class Linker {
 
 		if ( !$thumb ) {
 			$rdfaType = 'mw:Error ' . $rdfaType;
+			$currentExists = $file && $file->exists();
 			if ( $enableLegacyMediaDOM ) {
 				$label = $frameParams['title'];
 			} else {
-				$label = $frameParams['alt'] ?? '';
+				if ( $currentExists ) {
+					$label = wfMessage( 'thumbnail_error', '' )->text();
+				} else {
+					$label = $frameParams['alt'] ?? '';
+				}
 			}
 			$s = self::makeBrokenImageLinkObj(
-				$title, $label, '', '', '', (bool)$time, $handlerParams
+				$title, $label, '', '', '', (bool)$time, $handlerParams, $currentExists
 			);
 		} else {
 			self::processResponsiveImages( $file, $thumb, $handlerParams );
@@ -749,7 +754,7 @@ class Linker {
 				$label = $frameParams['alt'] ?? '';
 			}
 			$s .= self::makeBrokenImageLinkObj(
-				$title, $label, '', '', '', (bool)$time, $handlerParams
+				$title, $label, '', '', '', (bool)$time, $handlerParams, false
 			);
 			$zoomIcon = '';
 		} elseif ( !$thumb ) {
@@ -757,9 +762,9 @@ class Linker {
 			if ( $enableLegacyMediaDOM ) {
 				$s .= wfMessage( 'thumbnail_error', '' )->escaped();
 			} else {
-				$label = $frameParams['alt'] ?? '';
+				$label = wfMessage( 'thumbnail_error', '' )->text();
 				$s .= self::makeBrokenImageLinkObj(
-					$title, $label, '', '', '', (bool)$time, $handlerParams
+					$title, $label, '', '', '', (bool)$time, $handlerParams, true
 				);
 			}
 			$zoomIcon = '';
@@ -861,11 +866,12 @@ class Linker {
 	 * @param string $unused2 Unused parameter kept for b/c
 	 * @param bool $time A file of a certain timestamp was requested
 	 * @param array $handlerParams @since 1.36
+	 * @param bool $currentExists @since 1.41
 	 * @return string
 	 */
 	public static function makeBrokenImageLinkObj(
 		$title, $label = '', $query = '', $unused1 = '', $unused2 = '',
-		$time = false, array $handlerParams = []
+		$time = false, array $handlerParams = [], bool $currentExists = false
 	) {
 		if ( !$title instanceof LinkTarget ) {
 			wfWarn( __METHOD__ . ': Requires $title to be a LinkTarget object.' );
@@ -894,8 +900,8 @@ class Linker {
 		}
 
 		$repoGroup = $services->getRepoGroup();
-		$currentExists = $time
-			&& $repoGroup->findFile( $title ) !== false;
+		$currentExists = $currentExists ||
+			( $time && $repoGroup->findFile( $title ) !== false );
 
 		if ( ( $uploadMissingFileUrl || $uploadNavigationUrl || $enableUploads )
 			&& !$currentExists