From: Andrew H <crazy4sb@gmail.com>
Date: Tue, 5 Jan 2016 23:42:23 +0000 (+0000)
Subject: Fix --pagelist for dumpBackup.php
X-Git-Tag: 1.31.0-rc.0~8435^2
X-Git-Url: http://git.cyclocoop.org/%24dirpuce/puce%24spip_lang_rtl.gif?a=commitdiff_plain;h=f7e5a0750c69f59cac56580790425818e083c2ac;p=lhc%2Fweb%2Fwiklou.git

Fix --pagelist for dumpBackup.php

Followup patch for I2473ee119c185d1b2b00ac4b1e70ee8a6cafe4a3,
which broke the --pagelist option for dumpBackup.

Somehow this slipped by in review.

Change-Id: Ifa1fd0f63f7b8db4d51a760e37ac0876430f2e88
---

diff --git a/maintenance/dumpBackup.php b/maintenance/dumpBackup.php
index 6b5792a7c8..18737a458a 100644
--- a/maintenance/dumpBackup.php
+++ b/maintenance/dumpBackup.php
@@ -95,13 +95,10 @@ TEXT;
 		$this->reporting = !$this->hasOption( 'quiet' );
 
 		if ( $this->hasOption( 'pagelist' ) ) {
-			$olddir = getcwd();
-			chdir( $originalDir );
-			$pages = file( $this->getOption( 'quiet' ) );
-			chdir( $olddir );
+			$filename = $this->getOption( 'pagelist' );
+			$pages = file( $filename );
 			if ( $pages === false ) {
-				echo "Unable to open file {$options['pagelist']}\n";
-				die( 1 );
+				$this->fatalError( "Unable to open file {$filename}\n" );
 			}
 			$pages = array_map( 'trim', $pages );
 			$this->pages = array_filter( $pages, create_function( '$x', 'return $x !== "";' ) );