From 445b2447adc37544ba584950822e31f7c88a40c2 Mon Sep 17 00:00:00 2001
From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Mon, 1 Nov 2010 15:52:08 +0000
Subject: [PATCH] (bug 25717) Fix "Hide/show extended details" toggle in image
 metadata table

---
 includes/ImagePage.php   | 4 ----
 resources/Resources.php  | 1 +
 skins/common/metadata.js | 4 ++++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 69f17d8811..e1ffd8782e 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -143,13 +143,9 @@ class ImagePage extends Article {
 			$wgOut->addHTML( $html );
 
 		if ( $showmeta ) {
-			$expand = htmlspecialchars( Xml::escapeJsString( wfMsg( 'metadata-expand' ) ) );
-			$collapse = htmlspecialchars( Xml::escapeJsString( wfMsg( 'metadata-collapse' ) ) );
 			$wgOut->addHTML( Xml::element( 'h2', array( 'id' => 'metadata' ), wfMsg( 'metadata' ) ) . "\n" );
 			$wgOut->addWikiText( $this->makeMetadataTable( $formattedMetadata ) );
 			$wgOut->addModules( array( 'mediawiki.legacy.metadata' ) );
-			$wgOut->addHTML(
-				"<script type=\"text/javascript\">attachMetadataToggle('mw_metadata', '$expand', '$collapse');</script>\n" );
 		}
 		
 		$css = $this->repo->getDescriptionStylesheetUrl();
diff --git a/resources/Resources.php b/resources/Resources.php
index 98430bcb4d..8438eccb45 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -444,6 +444,7 @@ return array(
 	'mediawiki.legacy.metadata' => new ResourceLoaderFileModule( array(
 		'scripts' => 'skins/common/metadata.js',
 		'dependencies' => 'mediawiki.legacy.wikibits',
+		'messages' => array( 'metadata-expand', 'metadata-collapse' ),
 	) ),
 	'mediawiki.legacy.mwsuggest' => new ResourceLoaderFileModule( array(
 		'scripts' => 'skins/common/mwsuggest.js',
diff --git a/skins/common/metadata.js b/skins/common/metadata.js
index ed40cdbb2a..78bf41d69f 100644
--- a/skins/common/metadata.js
+++ b/skins/common/metadata.js
@@ -47,3 +47,7 @@ window.attachMetadataToggle = function( tableId, showText, hideText ) {
 	}
 	return false;
 }
+
+$( document ).ready( function() { 
+	attachMetadataToggle( 'mw_metadata', mediaWiki.msg( 'metadata-expand' ), mediaWiki.msg( 'metadata-collapse' ) );
+} );
-- 
2.20.1