http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96648
Revision: 96648
Author: ariel
Date: 2011-09-09 07:28:11 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
getFilename renamed to getFilenames since it can return a list
Modified Paths:
--------------
trunk/phase3/includes/Export.php
trunk/phase3/maintenance/dumpTextPass.php
Modified: trunk/phase3/includes/Export.php
===================================================================
--- trunk/phase3/includes/Export.php 2011-09-09 05:17:05 UTC (rev 96647)
+++ trunk/phase3/includes/Export.php 2011-09-09 07:28:11 UTC (rev 96648)
@@ -724,7 +724,7 @@
* Returns the name of the file or files which are
* being written to, if there are any.
*/
- function getFilename() {
+ function getFilenames() {
return NULL;
}
}
@@ -766,7 +766,7 @@
}
}
- function getFilename() {
+ function getFilenames() {
return $this->filename;
}
}
@@ -938,8 +938,8 @@
$this->sink->closeAndRename( $newname, $open );
}
- function getFilename() {
- return $this->sink->getFilename();
+ function getFilenames() {
+ return $this->sink->getFilenames();
}
/**
@@ -1100,10 +1100,10 @@
}
}
- function getFilename() {
+ function getFilenames() {
$filenames = array();
for ( $i = 0; $i < $this->count; $i++ ) {
- $filenames[] = $this->sinks[$i]->getFilename();
+ $filenames[] = $this->sinks[$i]->getFilenames();
}
return $filenames;
}
Modified: trunk/phase3/maintenance/dumpTextPass.php
===================================================================
--- trunk/phase3/maintenance/dumpTextPass.php 2011-09-09 05:17:05 UTC (rev
96647)
+++ trunk/phase3/maintenance/dumpTextPass.php 2011-09-09 07:28:11 UTC (rev
96648)
@@ -246,7 +246,7 @@
}
if ( $this->checkpointFiles ) {
- $filenameList = (array)$this->egress->getFilename();
+ $filenameList = (array)$this->egress->getFilenames();
if ( count( $filenameList ) != count(
$this->checkpointFiles ) ) {
throw new MWException("One checkpointfile must
be specified for each output option, if maxtime is used.\n");
}
@@ -282,7 +282,7 @@
$offset += strlen( $chunk );
} while ( $chunk !== false && !feof( $input ) );
if ($this->maxTimeAllowed) {
- $filenameList = (array)$this->egress->getFilename();
+ $filenameList = (array)$this->egress->getFilenames();
// we wrote some stuff after last checkpoint that needs
renamed
if (file_exists($filenameList[0])) {
$newFilenames = array();
@@ -571,7 +571,7 @@
$this->thisPage = "";
// this could be more than one file if we had
more than one output arg
$checkpointFilenames = array();
- $filenameList =
(array)$this->egress->getFilename();
+ $filenameList =
(array)$this->egress->getFilenames();
$newFilenames = array();
$firstPageID =
str_pad($this->firstPageWritten,9,"0",STR_PAD_LEFT);
$lastPageID =
str_pad($this->lastPageWritten,9,"0",STR_PAD_LEFT);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
