| Index: trunk/phase3/includes/filerepo/LocalFile.php |
| — | — | @@ -1365,7 +1365,7 @@ |
| 1366 | 1366 | $dbw->delete( 'oldimage', |
| 1367 | 1367 | array( |
| 1368 | 1368 | 'oi_name' => $this->file->getName(), |
| 1369 | | - 'oi_archive_name IN (' . $dbw->makeList( array_keys( $oldRels ) ) . ')' |
| | 1369 | + 'oi_archive_name' => array_keys( $oldRels ) |
| 1370 | 1370 | ), __METHOD__ ); |
| 1371 | 1371 | } |
| 1372 | 1372 | if ( $deleteCurrent ) { |
| Index: trunk/phase3/includes/FileDeleteForm.php |
| — | — | @@ -113,8 +113,8 @@ |
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | | - if( $status->isGood() ) wfRunHooks('FileDeleteComplete', array( |
| 118 | | - &$file, &$oldimage, &$article, &$wgUser, &$reason)); |
| | 117 | + if( $status->isGood() ) |
| | 118 | + wfRunHooks('FileDeleteComplete', array( &$file, &$oldimage, &$article, &$wgUser, &$reason)); |
| 119 | 119 | |
| 120 | 120 | return $status; |
| 121 | 121 | } |