Index: trunk/phase3/maintenance/dumpTextPass.php |
— | — | @@ -246,7 +246,7 @@ |
247 | 247 | } |
248 | 248 | |
249 | 249 | if ( $this->checkpointFiles ) { |
250 | | - $filenameList = (array)$this->egress->getFilename(); |
| 250 | + $filenameList = (array)$this->egress->getFilenames(); |
251 | 251 | if ( count( $filenameList ) != count( $this->checkpointFiles ) ) { |
252 | 252 | throw new MWException("One checkpointfile must be specified for each output option, if maxtime is used.\n"); |
253 | 253 | } |
— | — | @@ -282,7 +282,7 @@ |
283 | 283 | $offset += strlen( $chunk ); |
284 | 284 | } while ( $chunk !== false && !feof( $input ) ); |
285 | 285 | if ($this->maxTimeAllowed) { |
286 | | - $filenameList = (array)$this->egress->getFilename(); |
| 286 | + $filenameList = (array)$this->egress->getFilenames(); |
287 | 287 | // we wrote some stuff after last checkpoint that needs renamed |
288 | 288 | if (file_exists($filenameList[0])) { |
289 | 289 | $newFilenames = array(); |
— | — | @@ -571,7 +571,7 @@ |
572 | 572 | $this->thisPage = ""; |
573 | 573 | // this could be more than one file if we had more than one output arg |
574 | 574 | $checkpointFilenames = array(); |
575 | | - $filenameList = (array)$this->egress->getFilename(); |
| 575 | + $filenameList = (array)$this->egress->getFilenames(); |
576 | 576 | $newFilenames = array(); |
577 | 577 | $firstPageID = str_pad($this->firstPageWritten,9,"0",STR_PAD_LEFT); |
578 | 578 | $lastPageID = str_pad($this->lastPageWritten,9,"0",STR_PAD_LEFT); |
Index: trunk/phase3/includes/Export.php |
— | — | @@ -724,7 +724,7 @@ |
725 | 725 | * Returns the name of the file or files which are |
726 | 726 | * being written to, if there are any. |
727 | 727 | */ |
728 | | - function getFilename() { |
| 728 | + function getFilenames() { |
729 | 729 | return NULL; |
730 | 730 | } |
731 | 731 | } |
— | — | @@ -766,7 +766,7 @@ |
767 | 767 | } |
768 | 768 | } |
769 | 769 | |
770 | | - function getFilename() { |
| 770 | + function getFilenames() { |
771 | 771 | return $this->filename; |
772 | 772 | } |
773 | 773 | } |
— | — | @@ -938,8 +938,8 @@ |
939 | 939 | $this->sink->closeAndRename( $newname, $open ); |
940 | 940 | } |
941 | 941 | |
942 | | - function getFilename() { |
943 | | - return $this->sink->getFilename(); |
| 942 | + function getFilenames() { |
| 943 | + return $this->sink->getFilenames(); |
944 | 944 | } |
945 | 945 | |
946 | 946 | /** |
— | — | @@ -1100,10 +1100,10 @@ |
1101 | 1101 | } |
1102 | 1102 | } |
1103 | 1103 | |
1104 | | - function getFilename() { |
| 1104 | + function getFilenames() { |
1105 | 1105 | $filenames = array(); |
1106 | 1106 | for ( $i = 0; $i < $this->count; $i++ ) { |
1107 | | - $filenames[] = $this->sinks[$i]->getFilename(); |
| 1107 | + $filenames[] = $this->sinks[$i]->getFilenames(); |
1108 | 1108 | } |
1109 | 1109 | return $filenames; |
1110 | 1110 | } |