From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 26 Mar 2009 03:29:06 +0000 (+0000)
Subject: (bug 18031) Make namespace selector on Special:Export remember the previous selection
X-Git-Tag: 1.31.0-rc.0~42350
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=8db93e6dd7280638c8f2ee96d6a96471fedefe51;p=lhc%2Fweb%2Fwiklou.git

(bug 18031) Make namespace selector on Special:Export remember the previous selection
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7aabc7012a..59cc122585 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -290,6 +290,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 17241) The diffonly URI parameter should cascade to "Next edit" and "Previous edit" diff links
 * (bug 16823) 'Sidebar search form should not use Special:Search view URL as target'
 * (bug 16343) Non-existing, but in use, category pages can be "go" match hits
+* (bug 18031) Make namespace selector on Special:Export remember the previous 
+  selection
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions
diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php
index 2f40c73203..306eaf91b2 100644
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -65,9 +65,9 @@ class SpecialExport extends SpecialPage {
 		}
 		else if( $wgRequest->getCheck( 'addns' ) && $wgExportFromNamespaces ) {
 			$page = $wgRequest->getText( 'pages' );
-			$nsindex = $wgRequest->getText( 'nsindex' );
+			$nsindex = $wgRequest->getText( 'nsindex', '' );
 			
-			if ( $nsindex !== '' && $nsindex !== NULL && $nsindex !== false ) {
+			if ( $nsindex !== '' && $nsindex !== null && $nsindex !== false ) {
 				/**
 				 * Same implementation as above, so same @fixme
 				 */
@@ -151,7 +151,7 @@ class SpecialExport extends SpecialPage {
 		$form .= Xml::submitButton( wfMsg( 'export-addcat' ), array( 'name' => 'addcat' ) ) . '<br />';
 		
 		if ( $wgExportFromNamespaces ) {
-			$form .= Xml::namespaceSelector( '', null, 'nsindex', wfMsg( 'export-addnstext' ) ) . '&nbsp;';
+			$form .= Xml::namespaceSelector( $nsindex, null, 'nsindex', wfMsg( 'export-addnstext' ) ) . '&nbsp;';
 			$form .= Xml::submitButton( wfMsg( 'export-addns' ), array( 'name' => 'addns' ) ) . '<br />';
 		}