X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FFileDeleteForm.php;h=b4e245813f4585ec158a776ff0f25411fa6c811c;hb=cbdb81d1bc256caa87ac9e7fa857b8a800347905;hp=44aaeb4a6e44ae1b22b2721f2354211d39459c96;hpb=5775d5e5c15098da4c1ebc121e678cee95ecaafa;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index 44aaeb4a6e..b4e245813f 100644
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -83,7 +83,10 @@ class FileDeleteForm {
$suppress = $wgRequest->getVal( 'wpSuppress' ) && $wgUser->isAllowed( 'suppressrevision' );
if ( $this->oldimage ) {
- $this->oldfile = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $this->title, $this->oldimage );
+ $this->oldfile = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName(
+ $this->title,
+ $this->oldimage
+ );
}
if ( !self::haveDeletableFile( $this->file, $this->oldfile, $this->oldimage ) ) {
@@ -107,11 +110,20 @@ class FileDeleteForm {
$reason = $deleteReasonList;
}
- $status = self::doDelete( $this->title, $this->file, $this->oldimage, $reason, $suppress, $wgUser );
+ $status = self::doDelete(
+ $this->title,
+ $this->file,
+ $this->oldimage,
+ $reason,
+ $suppress,
+ $wgUser
+ );
if ( !$status->isGood() ) {
$wgOut->addHTML( '
' . $this->prepareMessage( 'filedeleteerror-short' ) . "
\n" );
- $wgOut->addWikiText( '' . $status->getWikiText( 'filedeleteerror-short', 'filedeleteerror-long' ) . '
' );
+ $wgOut->addWikiText( '' .
+ $status->getWikiText( 'filedeleteerror-short', 'filedeleteerror-long' )
+ . '
' );
}
if ( $status->ok ) {
$wgOut->setPageTitle( wfMessage( 'actioncomplete' ) );
@@ -141,7 +153,9 @@ class FileDeleteForm {
* @throws MWException
* @return bool|Status
*/
- public static function doDelete( &$title, &$file, &$oldimage, $reason, $suppress, User $user = null ) {
+ public static function doDelete( &$title, &$file, &$oldimage, $reason,
+ $suppress, User $user = null
+ ) {
if ( $user === null ) {
global $wgUser;
$user = $wgUser;
@@ -149,7 +163,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 +194,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 {
@@ -188,7 +202,8 @@ class FileDeleteForm {
}
}
} catch ( MWException $e ) {
- // rollback before returning to prevent UI from displaying incorrect "View or restore N deleted edits?"
+ // Rollback before returning to prevent UI from displaying
+ // incorrect "View or restore N deleted edits?"
$dbw->rollback( __METHOD__ );
throw $e;
}
@@ -266,8 +281,14 @@ class FileDeleteForm {
|
" .
- Xml::submitButton( wfMessage( 'filedelete-submit' )->text(),
- array( 'name' => 'mw-filedelete-submit', 'id' => 'mw-filedelete-submit', 'tabindex' => '4' ) ) .
+ Xml::submitButton(
+ wfMessage( 'filedelete-submit' )->text(),
+ array(
+ 'name' => 'mw-filedelete-submit',
+ 'id' => 'mw-filedelete-submit',
+ 'tabindex' => '4'
+ )
+ ) .
" |
" .
Xml::closeElement( 'table' ) .
@@ -309,8 +330,10 @@ class FileDeleteForm {
private function prepareMessage( $message ) {
global $wgLang;
if ( $this->oldimage ) {
+ # Message keys used:
+ # 'filedelete-intro-old', 'filedelete-nofile-old', 'filedelete-success-old'
return wfMessage(
- "{$message}-old", # To ensure grep will find them: 'filedelete-intro-old', 'filedelete-nofile-old', 'filedelete-success-old'
+ "{$message}-old",
wfEscapeWikiText( $this->title->getText() ),
$wgLang->date( $this->getTimestamp(), true ),
$wgLang->time( $this->getTimestamp(), true ),