From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Sat, 10 May 2008 11:56:02 +0000 (+0000)
Subject: * Use Xml:: and so
X-Git-Tag: 1.31.0-rc.0~47741
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=14db06a0015aec78f9f6d21ef7caab32ff6b3d70;p=lhc%2Fweb%2Fwiklou.git

* Use Xml:: and so
---

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index fa063dbcfd..9b48d1b4ec 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -314,22 +314,30 @@ class ImagePage extends Article {
 					}
 
 					global $wgScript;
-					$select = '<form name="pageselector" action="' .
-						htmlspecialchars( $wgScript ) .
-						'" method="get" onchange="document.pageselector.submit();">' .
-						Xml::hidden( 'title', $this->getTitle()->getPrefixedDbKey() );
-					$select .= $wgOut->parse( wfMsg( 'imgmultigotopre' ), false ) .
-						' <select id="pageselector" name="page">';
+
+					$formParams = array(
+						'name' => 'pageselector',
+						'action' => $wgScript,
+						'onchange' => 'document.pageselector.submit();',
+					);
+
+					$option = array();
 					for ( $i=1; $i <= $count; $i++ ) {
-						$select .= Xml::option( $wgLang->formatNum( $i ), $i,
-							$i == $page );
+						$options[] = Xml::option( $wgLang->formatNum($i), $i, $i == $page );
 					}
-					$select .= '</select>' . $wgOut->parse( wfMsg( 'imgmultigotopost' ), false ) .
-						'<input type="submit" value="' .
-						htmlspecialchars( wfMsg( 'imgmultigo' ) ) . '"></form>';
-
-					$wgOut->addHTML( '</td><td><div class="multipageimagenavbox">' .
-						"$select<hr />$thumb1\n$thumb2<br clear=\"all\" /></div></td></tr></table>" );
+					$select = Xml::tags( 'select',
+						array( 'id' => 'pageselector', 'name' => 'page' ),
+						implode( "\n", $options ) );
+
+					$wgOut->addHTML(
+						'</td><td><div class="multipageimagenavbox">' .
+						Xml::openElement( 'form', $formParams ) .
+						Xml::hidden( 'title', $this->getTitle()->getPrefixedDbKey() ) .
+						wfMsgExt( 'imgmultigoto', array( 'parseinline', 'replaceafter' ), $select ) .
+						Xml::submitButton( wfMsg( 'imgmultigo' ) ) .
+						Xml::closeElement( 'form' ) .
+						"<hr />$thumb1\n$thumb2<br clear=\"all\" /></div></td></tr></table>"
+					);
 				}
 			} else {
 				#if direct link is allowed but it's not a renderable image, show an icon.
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index acca2e24d9..5cab668a88 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3181,8 +3181,7 @@ $1',
 'imgmultipageprev' => '← previous page',
 'imgmultipagenext' => 'next page →',
 'imgmultigo'       => 'Go!',
-'imgmultigotopre'  => 'Go to page',
-'imgmultigotopost' => '', # only translate this message to other languages if you have to change it
+'imgmultigoto'  => 'Go to page $1',
 
 # Table pager
 'ascending_abbrev'         => 'asc',