Update to MediaWiki 1.19.0

1 files changed, 30 insertions, 28 deletions

diff --git a/includes/specials/SpecialAllpages.php b/includes/specials/SpecialAllpages.php
index a9cbf3ab..960a327a 100644
--- a/includes/specials/SpecialAllpages.php
+++ b/includes/specials/SpecialAllpages.php
@@ -73,16 +73,16 @@ class SpecialAllpages extends IncludableSpecialPage {
 
 		$namespaces = $wgContLang->getNamespaces();
 
-		$out->setPagetitle(
+		$out->setPageTitle(
 			( $namespace > 0 && in_array( $namespace, array_keys( $namespaces) ) ) ?
-			wfMsg( 'allinnamespace', str_replace( '_', ' ', $namespaces[$namespace] ) ) :
-			wfMsg( 'allarticles' )
+			$this->msg( 'allinnamespace', str_replace( '_', ' ', $namespaces[$namespace] ) ) :
+			$this->msg( 'allarticles' )
 		);
 		$out->addModuleStyles( 'mediawiki.special' );
 
-		if( isset($par) ) {
+		if( $par !== null ) {
 			$this->showChunk( $namespace, $par, $to );
-		} elseif( isset($from) && !isset($to) ) {
+		} elseif( $from !== null && $to === null ) {
 			$this->showChunk( $namespace, $from, $to );
 		} else {
 			$this->showToplevel( $namespace, $from, $to );
@@ -104,11 +104,11 @@ class SpecialAllpages extends IncludableSpecialPage {
 		$out .= Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
 		$out .= Html::hidden( 'title', $t->getPrefixedText() );
 		$out .= Xml::openElement( 'fieldset' );
-		$out .= Xml::element( 'legend', null, wfMsg( 'allpages' ) );
+		$out .= Xml::element( 'legend', null, $this->msg( 'allpages' )->text() );
 		$out .= Xml::openElement( 'table', array( 'id' => 'nsselect', 'class' => 'allpages' ) );
 		$out .= "<tr>
 	<td class='mw-label'>" .
-			Xml::label( wfMsg( 'allpagesfrom' ), 'nsfrom' ) .
+			Xml::label( $this->msg( 'allpagesfrom' )->text(), 'nsfrom' ) .
 			"	</td>
 	<td class='mw-input'>" .
 			Xml::input( 'from', 30, str_replace('_',' ',$from), array( 'id' => 'nsfrom' ) ) .
@@ -116,7 +116,7 @@ class SpecialAllpages extends IncludableSpecialPage {
 </tr>
 <tr>
 	<td class='mw-label'>" .
-			Xml::label( wfMsg( 'allpagesto' ), 'nsto' ) .
+			Xml::label( $this->msg( 'allpagesto' )->text(), 'nsto' ) .
 			"	</td>
 			<td class='mw-input'>" .
 			Xml::input( 'to', 30, str_replace('_',' ',$to), array( 'id' => 'nsto' ) ) .
@@ -124,11 +124,14 @@ class SpecialAllpages extends IncludableSpecialPage {
 </tr>
 <tr>
 	<td class='mw-label'>" .
-			Xml::label( wfMsg( 'namespace' ), 'namespace' ) .
+			Xml::label( $this->msg( 'namespace' )->text(), 'namespace' ) .
 			"	</td>
 			<td class='mw-input'>" .
-			Xml::namespaceSelector( $namespace, null ) . ' ' .
-			Xml::submitButton( wfMsg( 'allpagessubmit' ) ) .
+			Html::namespaceSelector(
+				array( 'selected' => $namespace ),
+				array( 'name' => 'namespace', 'id' => 'namespace' )
+			) . ' ' .
+			Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ) .
 			"	</td>
 </tr>";
 		$out .= Xml::closeElement( 'table' );
@@ -249,7 +252,7 @@ class SpecialAllpages extends IncludableSpecialPage {
 								$nsForm .
 							'</td>
 							<td class="mw-allpages-nav">' .
-								$this->getSkin()->link( $this->getTitle(), wfMsgHtml ( 'allpages' ),
+								Linker::link( $this->getTitle(), $this->msg( 'allpages' )->escaped(),
 									array(), array(), 'known' ) .
 							"</td>
 						</tr>" .
@@ -278,12 +281,12 @@ class SpecialAllpages extends IncludableSpecialPage {
 
 		$queryparams = $namespace ? "namespace=$namespace&" : '';
 		$special = $this->getTitle();
-		$link = $special->escapeLocalUrl( $queryparams . 'from=' . urlencode($inpoint) . '&to=' . urlencode($outpoint) );
+		$link = htmlspecialchars( $special->getLocalUrl( $queryparams . 'from=' . urlencode($inpoint) . '&to=' . urlencode($outpoint) ) );
 
-		$out = wfMsgHtml( 'alphaindexline',
+		$out = $this->msg( 'alphaindexline' )->rawParams(
 			"<a href=\"$link\">$inpointf</a></td><td>",
 			"</td><td><a href=\"$link\">$outpointf</a>"
-		);
+		)->escaped();
 		return '<tr><td class="mw-allpages-alphaindexline">' . $out . '</td></tr>';
 	}
 
@@ -293,9 +296,8 @@ class SpecialAllpages extends IncludableSpecialPage {
 	 * @param $to String: list all pages to this name (default FALSE)
 	 */
 	function showChunk( $namespace = NS_MAIN, $from = false, $to = false ) {
-		global $wgContLang, $wgLang;
+		global $wgContLang;
 		$output = $this->getOutput();
-		$sk = $this->getSkin();
 
 		$fromList = $this->getNamespaceKeyAndText($namespace, $from);
 		$toList = $this->getNamespaceKeyAndText( $namespace, $to );
@@ -303,10 +305,10 @@ class SpecialAllpages extends IncludableSpecialPage {
 		$n = 0;
 
 		if ( !$fromList || !$toList ) {
-			$out = wfMsgExt( 'allpagesbadtitle', 'parse' );
+			$out = $this->msg( 'allpagesbadtitle' )->parseAsBlock();
 		} elseif ( !in_array( $namespace, array_keys( $namespaces ) ) ) {
 			// Show errormessage and reset to NS_MAIN
-			$out = wfMsgExt( 'allpages-bad-ns', array( 'parseinline' ), $namespace );
+			$out = $this->msg( 'allpages-bad-ns', $namespace )->parse();
 			$namespace = NS_MAIN;
 		} else {
 			list( $namespace, $fromKey, $from ) = $fromList;
@@ -338,7 +340,7 @@ class SpecialAllpages extends IncludableSpecialPage {
 					$t = Title::newFromRow( $s );
 					if( $t ) {
 						$link = ( $s->page_is_redirect ? '<div class="allpagesredirect">' : '' ) .
-							$sk->link( $t ) .
+							Linker::link( $t ) .
 							($s->page_is_redirect ? '</div>' : '' );
 					} else {
 						$link = '[[' . htmlspecialchars( $s->page_title ) . ']]';
@@ -411,7 +413,7 @@ class SpecialAllpages extends IncludableSpecialPage {
 								$nsForm .
 							'</td>
 							<td class="mw-allpages-nav">' .
-								$sk->link( $self, wfMsgHtml ( 'allpages' ) );
+								Linker::link( $self, $this->msg( 'allpages' )->escaped() );
 
 			# Do we put a previous link ?
 			if( isset( $prevTitle ) &&  $pt = $prevTitle->getText() ) {
@@ -420,13 +422,13 @@ class SpecialAllpages extends IncludableSpecialPage {
 				if( $namespace )
 					$query['namespace'] = $namespace;
 
-				$prevLink = $sk->linkKnown(
+				$prevLink = Linker::linkKnown(
 					$self,
-					wfMessage( 'prevpage', $pt )->escaped(),
+					$this->msg( 'prevpage', $pt )->escaped(),
 					array(),
 					$query
 				);
-				$out2 = $wgLang->pipeList( array( $out2, $prevLink ) );
+				$out2 = $this->getLanguage()->pipeList( array( $out2, $prevLink ) );
 			}
 
 			if( $n == $this->maxPerPage && $s = $res->fetchObject() ) {
@@ -437,13 +439,13 @@ class SpecialAllpages extends IncludableSpecialPage {
 				if( $namespace )
 					$query['namespace'] = $namespace;
 
-				$nextLink = $sk->linkKnown(
+				$nextLink = Linker::linkKnown(
 					$self,
-					wfMessage( 'nextpage', $t->getText() )->escaped(),
+					$this->msg( 'nextpage', $t->getText() )->escaped(),
 					array(),
 					$query
 				);
-				$out2 = $wgLang->pipeList( array( $out2, $nextLink ) );
+				$out2 = $this->getLanguage()->pipeList( array( $out2, $nextLink ) );
 			}
 			$out2 .= "</td></tr></table>";
 		}
@@ -458,7 +460,7 @@ class SpecialAllpages extends IncludableSpecialPage {
 			$output->addHTML(
 				Html::element( 'hr' ) .
 				Html::rawElement( 'div', array( 'class' => 'mw-allpages-nav' ),
-					$wgLang->pipeList( $links )
+					$this->getLanguage()->pipeList( $links )
 				) );
 		}