From a17746274f86928d20b6dee0acdabcb24a12495e Mon Sep 17 00:00:00 2001
From: "C. Scott Ananian" <cscott@cscott.net>
Date: Wed, 17 Oct 2018 10:47:35 -0400
Subject: [PATCH] Remove untidy wrapper from ImagePage::makeMetadataTable()

Replace a fragile <div> wrapper with the robust
OutputPage::wrapWikiTextAsInterface() wrapper.

Bug: T205624
Change-Id: I0a1ba0da6af97f0233afdd8ba7202abed0998419
---
 includes/page/ImagePage.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index c879a8807c..c933c15f7d 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -187,7 +187,10 @@ class ImagePage extends Article {
 				'h2',
 				[ 'id' => 'metadata' ],
 					$this->getContext()->msg( 'metadata' )->text() ) . "\n" );
-			$out->addWikiTextAsInterface( $this->makeMetadataTable( $formattedMetadata ) );
+			$out->wrapWikiTextAsInterface(
+				'mw-imagepage-section-metadata',
+				$this->makeMetadataTable( $formattedMetadata )
+			);
 			$out->addModules( [ 'mediawiki.action.view.metadata' ] );
 		}
 
@@ -246,8 +249,7 @@ class ImagePage extends Article {
 	 * @return string The metadata table. This is treated as Wikitext (!)
 	 */
 	protected function makeMetadataTable( $metadata ) {
-		$r = "<div class=\"mw-imagepage-section-metadata\">";
-		$r .= $this->getContext()->msg( 'metadata-help' )->plain();
+		$r = $this->getContext()->msg( 'metadata-help' )->plain();
 		// Intial state is collapsed
 		// see filepage.css and mediawiki.action.view.metadata module.
 		$r .= "<table id=\"mw_metadata\" class=\"mw_metadata collapsed\">\n";
@@ -264,7 +266,7 @@ class ImagePage extends Article {
 				);
 			}
 		}
-		$r .= "</table>\n</div>\n";
+		$r .= "</table>\n";
 		return $r;
 	}
 
-- 
2.20.1