From: Arne Heizmann <timwi@users.mediawiki.org>
Date: Tue, 21 Sep 2004 00:17:12 +0000 (+0000)
Subject: bugfix: Special:Allpages "next" link should include &namespace= parameter
X-Git-Tag: 1.5.0alpha1~1925
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=d413d2c158a2ce45b1d79f722be80a2b65630989;p=lhc%2Fweb%2Fwiklou.git

bugfix: Special:Allpages "next" link should include &namespace= parameter
---

diff --git a/includes/SpecialAllpages.php b/includes/SpecialAllpages.php
index 993a77f1b5..0525e946f1 100644
--- a/includes/SpecialAllpages.php
+++ b/includes/SpecialAllpages.php
@@ -51,7 +51,8 @@ function namespaceForm ( $namespace = 0, $from = '' ) {
 
 	$out = "<div class='namespaceselector'><form method='get' action='{$wgScript}'>";
 	$out .= '<input type="hidden" name="title" value="'.$t->getPrefixedText().'" />';
-	$out .= wfMsg ( 'allpagesformtext', $frombox, $namespaceselect, $submitbutton );
+	$out .= wfMsg ( 'allpagesformtext1', $frombox ) . '<br />';
+	$out .= wfMsg ( 'allpagesformtext2', $namespaceselect, $submitbutton );
 	$out .= '</form></div>';
 	return $out;
 }
@@ -226,10 +227,11 @@ function indexShowChunk( $from, $namespace = 0 ) {
 			$sk->makeKnownLink( $wgLang->specialPage( "Allpages" ),
 				wfMsg ( 'allpages' ) );
 	if ( ($n == $indexMaxperpage) && ($s = $dbr->fetchObject( $res )) ) {
+		$namespaceparam = $namespace ? "&namespace=$namespace" : "";
 		$out2 .= " | " . $sk->makeKnownLink(
 			$wgLang->specialPage( "Allpages" ),
 			wfMsg ( 'nextpage', $s->cur_title ),
-			"from=" . wfUrlEncode ( $s->cur_title ) );
+			"from=" . wfUrlEncode ( $s->cur_title ) . $namespaceparam );
 	}
 	$out2 .= "</td></tr></table><hr />";
 
diff --git a/languages/Language.php b/languages/Language.php
index a797f82eb9..85cfa0ff87 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1029,7 +1029,8 @@ You can narrow down the view by selecting a log type, the user name, or the affe
 # Special:Allpages
 'nextpage'          => 'Next page ($1)',
 'articlenamespace'  => '(articles)',
-'allpagesformtext'  => 'Display pages starting at: $1 Choose namespace: $2 $3',
+'allpagesformtext1' => 'Display pages starting at: $1',
+'allpagesformtext2' => 'Choose namespace: $2 $3',
 'allarticles'       => 'All articles',
 'allpagesprev'      => 'Previous',
 'allpagesnext'      => 'Next',