From: Aaron Schulz Date: Sun, 9 Sep 2012 02:15:27 +0000 (-0700) Subject: Renamed $pairs => $triples. X-Git-Tag: 1.31.0-rc.0~22421^2 X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/gestion/rappel_supprimer.php?a=commitdiff_plain;h=c19adb55acaa1c1f74f7de77bed86eb3a277315d;p=lhc%2Fweb%2Fwiklou.git Renamed $pairs => $triples. Change-Id: Ia87880ed00e734c577e0ab6d07cdac5c8b1dd619 --- diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php index 30d6825af2..6a3ae12af6 100644 --- a/includes/filerepo/FileRepo.php +++ b/includes/filerepo/FileRepo.php @@ -885,20 +885,20 @@ class FileRepo { * * When "dispositions" are given they are used as Content-Disposition if supported. * - * @param $pairs Array List of tuples (file system path, virtual URL/storage path, disposition) + * @param $triples Array List of (file system path, virtual URL/storage path, disposition) * @return FileRepoStatus */ - public function quickImportBatch( array $pairs ) { + public function quickImportBatch( array $triples ) { $status = $this->newGood(); $operations = array(); - foreach ( $pairs as $pair ) { - list ( $src, $dst ) = $pair; + foreach ( $triples as $triple ) { + list( $src, $dst ) = $triple; $dst = $this->resolveToStoragePath( $dst ); $operations[] = array( 'op' => 'store', 'src' => $src, 'dst' => $dst, - 'disposition' => isset( $pair[2] ) ? $pair[2] : null + 'disposition' => isset( $triple[2] ) ? $triple[2] : null ); $status->merge( $this->initDirectory( dirname( $dst ) ) ); }