| Index: trunk/phase3/includes/filerepo/LocalFile.php |
| — | — | @@ -2083,8 +2083,19 @@ |
| 2084 | 2084 | * @ingroup FileRepo |
| 2085 | 2085 | */ |
| 2086 | 2086 | class LocalFileMoveBatch { |
| 2087 | | - var $file, $cur, $olds, $oldCount, $archive, $target, $db; |
| 2088 | 2087 | |
| | 2088 | + /** |
| | 2089 | + * @var File |
| | 2090 | + */ |
| | 2091 | + var $file; |
| | 2092 | + |
| | 2093 | + /** |
| | 2094 | + * @var Title |
| | 2095 | + */ |
| | 2096 | + var $target; |
| | 2097 | + |
| | 2098 | + var $cur, $olds, $oldCount, $archive, $db; |
| | 2099 | + |
| 2089 | 2100 | function __construct( File $file, Title $target ) { |
| 2090 | 2101 | $this->file = $file; |
| 2091 | 2102 | $this->target = $target; |
| — | — | @@ -2160,7 +2171,7 @@ |
| 2161 | 2172 | |
| 2162 | 2173 | // Copy the files into their new location |
| 2163 | 2174 | $statusMove = $repo->storeBatch( $triplets ); |
| 2164 | | - wfDebugLog( 'imagemove', "Moved files for {$this->file->name}: {$statusMove->successCount} successes, {$statusMove->failCount} failures" ); |
| | 2175 | + wfDebugLog( 'imagemove', "Moved files for {$this->file->getName()}: {$statusMove->successCount} successes, {$statusMove->failCount} failures" ); |
| 2165 | 2176 | if ( !$statusMove->isGood() ) { |
| 2166 | 2177 | wfDebugLog( 'imagemove', "Error in moving files: " . $statusMove->getWikiText() ); |
| 2167 | 2178 | $this->cleanupTarget( $triplets ); |
| — | — | @@ -2170,7 +2181,7 @@ |
| 2171 | 2182 | |
| 2172 | 2183 | $this->db->begin(); |
| 2173 | 2184 | $statusDb = $this->doDBUpdates(); |
| 2174 | | - wfDebugLog( 'imagemove', "Renamed {$this->file->name} in database: {$statusDb->successCount} successes, {$statusDb->failCount} failures" ); |
| | 2185 | + wfDebugLog( 'imagemove', "Renamed {$this->file->getName()} in database: {$statusDb->successCount} successes, {$statusDb->failCount} failures" ); |
| 2175 | 2186 | if ( !$statusDb->isGood() ) { |
| 2176 | 2187 | $this->db->rollback(); |
| 2177 | 2188 | // Something went wrong with the DB updates, so remove the target files |
| — | — | @@ -2249,7 +2260,7 @@ |
| 2250 | 2261 | // $move: (oldRelativePath, newRelativePath) |
| 2251 | 2262 | $srcUrl = $this->file->repo->getVirtualUrl() . '/public/' . rawurlencode( $move[0] ); |
| 2252 | 2263 | $triplets[] = array( $srcUrl, 'public', $move[1] ); |
| 2253 | | - wfDebugLog( 'imagemove', "Generated move triplet for {$this->file->name}: {$srcUrl} :: public :: {$move[1]}" ); |
| | 2264 | + wfDebugLog( 'imagemove', "Generated move triplet for {$this->file->getName()}: {$srcUrl} :: public :: {$move[1]}" ); |
| 2254 | 2265 | } |
| 2255 | 2266 | |
| 2256 | 2267 | return $triplets; |