dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
938cdc3
)
Merge "Return log id for file deletions"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Wed, 7 Oct 2015 16:19:06 +0000
(16:19 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Wed, 7 Oct 2015 16:19:06 +0000
(16:19 +0000)
includes/FileDeleteForm.php
patch
|
blob
|
history
diff --git
a/includes/FileDeleteForm.php
b/includes/FileDeleteForm.php
index
bcd6db2
..
5e7f5b2
100644
(file)
--- a/
includes/FileDeleteForm.php
+++ b/
includes/FileDeleteForm.php
@@
-180,6
+180,8
@@
class FileDeleteForm {
$logEntry->setComment( $logComment );
$logid = $logEntry->insert();
$logEntry->publish( $logid );
+
+ $status->value = $logid;
}
} else {
$status = Status::newFatal( 'cannotdelete',
@@
-197,6
+199,7
@@
class FileDeleteForm {
$status = $file->delete( $reason, $suppress, $user );
if ( $status->isOK() ) {
$dbw->commit( __METHOD__ );
+ $status->value = $deleteStatus->value; // log id
} else {
$dbw->rollback( __METHOD__ );
}