Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pass $user to LocalFileDeleteBatch

Browse source 
This avoids the use of $wgUser

Change-Id: I60cab27e0708a818c77791cc89194b6dd726da0b
This commit is contained in:
umherirrender 2014-05-06 21:03:45 +02:00
parent b08254f12f
commit 2d11016ecd
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/FileDeleteForm.php
View file

@ -149,7 +149,7 @@ class FileDeleteForm {
if ( $oldimage ) {
$page = null;
$status = $file->deleteOld( $oldimage, $reason, $suppress );
$status = $file->deleteOld( $oldimage, $reason, $suppress, $user );
if ( $status->ok ) {
// Need to do a log item
$logComment = wfMessage( 'deletedrevision', $oldimage )->inContentLanguage()->text();
@ -180,7 +180,7 @@ class FileDeleteForm {
// doDeleteArticleReal() returns a non-fatal error status if the page
// or revision is missing, so check for isOK() rather than isGood()
if ( $deleteStatus->isOK() ) {
$status = $file->delete( $reason, $suppress );
$status = $file->delete( $reason, $suppress, $user );
if ( $status->isOK() ) {
$dbw->commit( __METHOD__ );
} else {

26
includes/filerepo/file/LocalFile.php
View file

@ -1599,14 +1599,15 @@ class LocalFile extends File {
*
* @param string $reason
* @param bool $suppress
* @param User|null $user
* @return FileRepoStatus
*/
function delete( $reason, $suppress = false ) {
function delete( $reason, $suppress = false, $user = null ) {
if ( $this->getRepo()->getReadOnlyReason() !== false ) {
return $this->readOnlyFatalStatus();
}
$batch = new LocalFileDeleteBatch( $this, $reason, $suppress );
$batch = new LocalFileDeleteBatch( $this, $reason, $suppress, $user );
$this->lock(); // begin
$batch->addCurrent();
@ -1656,16 +1657,17 @@ class LocalFile extends File {
* @param string $archiveName
* @param string $reason
* @param bool $suppress
* @param User|null $user
* @throws MWException Exception on database or file store failure
* @return FileRepoStatus
*/
function deleteOld( $archiveName, $reason, $suppress = false ) {
function deleteOld( $archiveName, $reason, $suppress = false, $user = null ) {
global $wgUseSquid;
if ( $this->getRepo()->getReadOnlyReason() !== false ) {
return $this->readOnlyFatalStatus();
}
$batch = new LocalFileDeleteBatch( $this, $reason, $suppress );
$batch = new LocalFileDeleteBatch( $this, $reason, $suppress, $user );
$this->lock(); // begin
$batch->addOld( $archiveName );
@ -1964,15 +1966,25 @@ class LocalFileDeleteBatch {
/** @var FileRepoStatus */
private $status;
/** @var User */
private $user;
/**
* @param File $file
* @param string $reason
* @param bool $suppress
* @param User|null $user
*/
function __construct( File $file, $reason = '', $suppress = false ) {
function __construct( File $file, $reason = '', $suppress = false, $user = null ) {
$this->file = $file;
$this->reason = $reason;
$this->suppress = $suppress;
if ( $user ) {
$this->user = $user;
} else {
global $wgUser;
$this->user = $wgUser;
}
$this->status = $file->repo->newGood();
}
@ -2086,11 +2098,9 @@ class LocalFileDeleteBatch {
}
function doDBInserts() {
global $wgUser;
$dbw = $this->file->repo->getMasterDB();
$encTimestamp = $dbw->addQuotes( $dbw->timestamp() );
$encUserId = $dbw->addQuotes( $wgUser->getId() );
$encUserId = $dbw->addQuotes( $this->user->getId() );
$encReason = $dbw->addQuotes( $this->reason );
$encGroup = $dbw->addQuotes( 'deleted' );
$ext = $this->file->getExtension();