From: Tim Starling <tstarling@users.mediawiki.org>
Date: Mon, 5 Mar 2007 17:36:58 +0000 (+0000)
Subject: Revert of r20085, breaks retrieval with GET and subpage syntax, which breaks transwik... 
X-Git-Tag: 1.31.0-rc.0~53909
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=98a4e6e0ff163f16606b288be10371f64721b1c7;p=lhc%2Fweb%2Fwiklou.git

Revert of r20085, breaks retrieval with GET and subpage syntax, which breaks transwiki and probably various other things.
---

diff --git a/includes/SpecialExport.php b/includes/SpecialExport.php
index 93697e68f2..610f627a7f 100644
--- a/includes/SpecialExport.php
+++ b/includes/SpecialExport.php
@@ -21,34 +21,6 @@
  * @addtogroup SpecialPage
  */
 
-function wfExportGetPagesFromCategory( $title ) {
-	global $wgContLang;
-
-	$name = $title->getDBKey();
-
-	$dbr = wfGetDB( DB_SLAVE );
-
-	list( $page, $categorylinks ) = $dbr->tableNamesN( 'page', 'categorylinks' );
-	$sql = "SELECT page_namespace, page_title FROM $page " .
-		"JOIN $categorylinks ON cl_from = page_id " .
-		"WHERE cl_to = " . $dbr->addQuotes( $name );
-
-	$pages = array();
-	$res = $dbr->query( $sql, 'wfExportGetPagesFromCategory' );
-	while ( $row = $dbr->fetchObject( $res ) ) {
-		$n = $row->page_title;
-		if ($row->page_namespace) {
-			$ns = $wgContLang->getNsText( $row->page_namespace );
-			$n = $ns . ':' . $n;
-		}
-
-		$pages[] = $n;
-	}
-	$dbr->freeResult($res);
-
-	return $pages;
-}
-
 /**
  *
  */
@@ -57,22 +29,7 @@ function wfSpecialExport( $page = '' ) {
 	global $wgExportAllowHistory, $wgExportMaxHistory;
 
 	$curonly = true;
-	$doexport = false;
-	$page = NULL;
-
-	if ( $wgRequest->getCheck( 'addcat' ) ) {
-		$page = $wgRequest->getText( 'pages' );
-		$catname = $wgRequest->getText( 'catname' );
-		
-		if ( $catname !== '' && $catname !== NULL && $catname !== false ) {
-			$t = Title::makeTitleSafe( NS_CATEGORY, $catname );
-			if ( $t ) {
-				$catpages = wfExportGetPagesFromCategory( $t );
-				if ( $catpages ) $page .= "\n" . implode( "\n", $catpages );
-			}
-		}
-	}
-	else if( $wgRequest->wasPosted() ) {
+	if( $wgRequest->wasPosted() ) {
 		$page = $wgRequest->getText( 'pages' );
 		$curonly = $wgRequest->getCheck( 'curonly' );
 		$rawOffset = $wgRequest->getVal( 'offset' );
@@ -102,8 +59,6 @@ function wfSpecialExport( $page = '' ) {
 				$history['dir'] = 'desc';
 			}
 		}
-		
-		if( $page != '' ) $doexport = true;
 	} else {
 		// Default to current-only for GET requests
 		$page = $wgRequest->getText( 'pages', $page );
@@ -113,10 +68,7 @@ function wfSpecialExport( $page = '' ) {
 		} else {
 			$history = WikiExporter::CURRENT;
 		}
-		
-		if( $page != '' ) $doexport = true;
 	}
-
 	if( !$wgExportAllowHistory ) {
 		// Override
 		$history = WikiExporter::CURRENT;
@@ -125,7 +77,7 @@ function wfSpecialExport( $page = '' ) {
 	$list_authors = $wgRequest->getCheck( 'listauthors' );
 	if ( !$curonly || !$wgExportAllowListContributors ) $list_authors = false ;
 
-	if ( $doexport ) {
+	if( $page != '' ) {
 		$wgOut->disable();
 		
 		// Cancel output buffering and gzipping if set
@@ -169,12 +121,7 @@ function wfSpecialExport( $page = '' ) {
 	$titleObj = SpecialPage::getTitleFor( "Export" );
 	
 	$form = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $titleObj->getLocalUrl() ) );
-
-	$form .= wfInputLabel( wfMsg( 'export-addcattext' ), 'catname', 'catname', 40 ) . ' ';
-	$form .= wfSubmitButton( wfMsg( 'export-addcat' ), array( 'name' => 'addcat' ) ) . '<br />';
-
-	$form .= wfOpenElement( 'textarea', array( 'name' => 'pages', 'cols' => 40, 'rows' => 10 ) ) . htmlspecialchars($page). '</textarea><br />';
-
+	$form .= wfOpenElement( 'textarea', array( 'name' => 'pages', 'cols' => 40, 'rows' => 10 ) ) . '</textarea><br />';
 	if( $wgExportAllowHistory ) {
 		$form .= wfCheck( 'curonly', true, array( 'value' => 'true', 'id' => 'curonly' ) );
 		$form .= wfLabel( wfMsg( 'exportcuronly' ), 'curonly' ) . '<br />';