Merge "mw.Upload.BookletLayout: Require non-whitespace description"

[lhc/web/wiklou.git] / includes / revisiondelete / RevDelLogItem.php

diff --git a/includes/revisiondelete/RevDelLogItem.php b/includes/revisiondelete/RevDelLogItem.php
index 5c8b8c9..65b0309 100644 (file)
--- a/includes/revisiondelete/RevDelLogItem.php
+++ b/includes/revisiondelete/RevDelLogItem.php
@@ -48,11 +48,26 @@ class RevDelLogItem extends RevDelItem {
        }
 
        public function getBits() {
-               return $this->row->log_deleted;
+               return (int)$this->row->log_deleted;
        }
 
        public function setBits( $bits ) {
                $dbw = wfGetDB( DB_MASTER );
+
+               $dbw->update( 'logging',
+                       array( 'log_deleted' => $bits ),
+                       array(
+                               'log_id' => $this->row->log_id,
+                               'log_deleted' => $this->getBits() // cas
+                       ),
+                       __METHOD__
+               );
+
+               if ( !$dbw->affectedRows() ) {
+                       // Concurrent fail!
+                       return false;
+               }
+
                $dbw->update( 'recentchanges',
                        array(
                                'rc_deleted' => $bits,
@@ -64,16 +79,8 @@ class RevDelLogItem extends RevDelItem {
                        ),
                        __METHOD__
                );
-               $dbw->update( 'logging',
-                       array( 'log_deleted' => $bits ),
-                       array(
-                               'log_id' => $this->row->log_id,
-                               'log_deleted' => $this->getBits()
-                       ),
-                       __METHOD__
-               );
 
-               return (bool)$dbw->affectedRows();
+               return true;
        }
 
        public function getHTML() {
@@ -124,15 +131,7 @@ class RevDelLogItem extends RevDelItem {
                        : array();
 
                if ( LogEventsList::userCan( $this->row, LogPage::DELETED_ACTION, $user ) ) {
-                       ApiQueryLogEvents::addLogParams(
-                               $result,
-                               $ret,
-                               $logEntry->getParameters(),
-                               $logEntry->getType(),
-                               $logEntry->getSubtype(),
-                               $logEntry->getTimestamp(),
-                               $logEntry->isLegacy()
-                       );
+                       $ret['params'] = LogFormatter::newFromEntry( $logEntry )->formatParametersForApi();
                }
                if ( LogEventsList::userCan( $this->row, LogPage::DELETED_USER, $user ) ) {
                        $ret += array(