| Index: trunk/phase3/maintenance/cleanupUploadStash.php |
| — | — | @@ -73,7 +73,7 @@ |
| 74 | 74 | $stash->getFile( $key, true ); |
| 75 | 75 | $stash->removeFileNoAuth( $key ); |
| 76 | 76 | } catch ( UploadStashBadPathException $ex ) { |
| 77 | | - $this->output( 'Failed removing stashed upload with key:' . $key ); |
| | 77 | + $this->output( "Failed removing stashed upload with key: $key\n" ); |
| 78 | 78 | continue; |
| 79 | 79 | } |
| 80 | 80 | } |
| Index: trunk/phase3/includes/upload/UploadStash.php |
| — | — | @@ -331,13 +331,13 @@ |
| 332 | 332 | $dbw = $this->repo->getMasterDb(); |
| 333 | 333 | |
| 334 | 334 | // this gets its own transaction since it's called serially by the cleanupUploadStash maintenance script |
| 335 | | - $dbw->begin(); |
| | 335 | + $dbw->begin( __METHOD__ ); |
| 336 | 336 | $dbw->delete( |
| 337 | 337 | 'uploadstash', |
| 338 | 338 | array( 'us_key' => $key ), |
| 339 | 339 | __METHOD__ |
| 340 | 340 | ); |
| 341 | | - $dbw->commit(); |
| | 341 | + $dbw->commit( __METHOD__ ); |
| 342 | 342 | |
| 343 | 343 | // TODO: look into UnregisteredLocalFile and find out why the rv here is sometimes wrong (false when file was removed) |
| 344 | 344 | // for now, ignore. |