War on wfElement() and friends. Call the Xml members directly, rather than using...

[lhc/web/wiklou.git] / includes / ImagePage.php

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 8723160..e47df22 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -131,8 +131,8 @@ class ImagePage extends Article {
 
                if( $showmeta ) {
                        global $wgStylePath, $wgStyleVersion;
-                       $expand = htmlspecialchars( wfEscapeJsString( wfMsg( 'metadata-expand' ) ) );
-                       $collapse = htmlspecialchars( wfEscapeJsString( wfMsg( 'metadata-collapse' ) ) );
+                       $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->addScriptFile( 'metadata.js' );
@@ -595,7 +595,6 @@ EOT
 
                $this->loadFile();
                $pager = new ImageHistoryPseudoPager( $this );
-               # Generate prev/next links
                $wgOut->addHTML( $pager->getBody() );
 
                $this->img->resetHistory(); // free db resources