Merge "[FileBackend] Tweaks to speed up backend copy script."
[lhc/web/wiklou.git] / includes / revisiondelete / RevisionDelete.php
index c1d6ebd..6ceadff 100644 (file)
 <?php
+/**
+ * Base implementations for deletable items.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup RevisionDelete
+ */
+
 /**
  * List for revision table items
+ *
+ * This will check both the 'revision' table for live revisions and the
+ * 'archive' table for traditionally-deleted revisions that have an
+ * ar_rev_id saved.
+ *
+ * See RevDel_RevisionItem and RevDel_ArchivedRevisionItem for items.
  */
 class RevDel_RevisionList extends RevDel_List {
        var $currentRevId;
-       var $type = 'revision';
-       var $idField = 'rev_id';
-       var $dateField = 'rev_timestamp';
-       var $authorIdField = 'rev_user';
-       var $authorNameField = 'rev_user_text';
 
+       public function getType() {
+               return 'revision';
+       }
+
+       public static function getRelationType() {
+               return 'rev_id';
+       }
+
+       /**
+        * @param $db DatabaseBase
+        * @return mixed
+        */
        public function doQuery( $db ) {
                $ids = array_map( 'intval', $this->ids );
-               return $db->select( array('revision','page'), '*',
+               $live = $db->select(
+                       array( 'revision', 'page', 'user' ),
+                       array_merge( Revision::selectFields(), Revision::selectUserFields() ),
                        array(
                                'rev_page' => $this->title->getArticleID(),
                                'rev_id'   => $ids,
-                               'rev_page = page_id'
                        ),
                        __METHOD__,
-                       array( 'ORDER BY' => 'rev_id DESC' )
+                       array( 'ORDER BY' => 'rev_id DESC' ),
+                       array(
+                               'page' => Revision::pageJoinCond(),
+                               'user' => Revision::userJoinCond() )
                );
+
+               if ( $live->numRows() >= count( $ids ) ) {
+                       // All requested revisions are live, keeps things simple!
+                       return $live;
+               }
+
+               // Check if any requested revisions are available fully deleted.
+               $archived = $db->select( array( 'archive' ), '*',
+                       array(
+                               'ar_rev_id' => $ids
+                       ),
+                       __METHOD__,
+                       array( 'ORDER BY' => 'ar_rev_id DESC' )
+               );
+
+               if ( $archived->numRows() == 0 ) {
+                       return $live;
+               } elseif ( $live->numRows() == 0 ) {
+                       return $archived;
+               } else {
+                       // Combine the two! Whee
+                       $rows = array();
+                       foreach ( $live as $row ) {
+                               $rows[$row->rev_id] = $row;
+                       }
+                       foreach ( $archived as $row ) {
+                               $rows[$row->ar_rev_id] = $row;
+                       }
+                       krsort( $rows );
+                       return new FakeResultWrapper( array_values( $rows ) );
+               }
        }
 
        public function newItem( $row ) {
-               return new RevDel_RevisionItem( $this, $row );
+               if ( isset( $row->rev_id ) ) {
+                       return new RevDel_RevisionItem( $this, $row );
+               } elseif ( isset( $row->ar_rev_id ) ) {
+                       return new RevDel_ArchivedRevisionItem( $this, $row );
+               } else {
+                       // This shouldn't happen. :)
+                       throw new MWException( 'Invalid row type in RevDel_RevisionList' );
+               }
        }
 
        public function getCurrent() {
                if ( is_null( $this->currentRevId ) ) {
                        $dbw = wfGetDB( DB_MASTER );
-                       $this->currentRevId = $dbw->selectField( 
+                       $this->currentRevId = $dbw->selectField(
                                'page', 'page_latest', $this->title->pageCond(), __METHOD__ );
                }
                return $this->currentRevId;
@@ -54,7 +131,7 @@ class RevDel_RevisionList extends RevDel_List {
 }
 
 /**
- * Item class for a revision table row
+ * Item class for a live revision table row
  */
 class RevDel_RevisionItem extends RevDel_Item {
        var $revision;
@@ -64,16 +141,32 @@ class RevDel_RevisionItem extends RevDel_Item {
                $this->revision = new Revision( $row );
        }
 
+       public function getIdField() {
+               return 'rev_id';
+       }
+
+       public function getTimestampField() {
+               return 'rev_timestamp';
+       }
+
+       public function getAuthorIdField() {
+               return 'rev_user';
+       }
+
+       public function getAuthorNameField() {
+               return 'user_name'; // see Revision::selectUserFields()
+       }
+
        public function canView() {
-               return $this->revision->userCan( Revision::DELETED_RESTRICTED );
+               return $this->revision->userCan( Revision::DELETED_RESTRICTED, $this->list->getUser() );
        }
-       
+
        public function canViewContent() {
-               return $this->revision->userCan( Revision::DELETED_TEXT );
+               return $this->revision->userCan( Revision::DELETED_TEXT, $this->list->getUser() );
        }
 
        public function getBits() {
-               return $this->revision->mDeleted;
+               return $this->revision->getVisibility();
        }
 
        public function setBits( $bits ) {
@@ -81,8 +174,8 @@ class RevDel_RevisionItem extends RevDel_Item {
                // Update revision table
                $dbw->update( 'revision',
                        array( 'rev_deleted' => $bits ),
-                       array( 
-                               'rev_id' => $this->revision->getId(), 
+                       array(
+                               'rev_id' => $this->revision->getId(),
                                'rev_page' => $this->revision->getPage(),
                                'rev_deleted' => $this->getBits()
                        ),
@@ -94,7 +187,7 @@ class RevDel_RevisionItem extends RevDel_Item {
                }
                // Update recentchanges table
                $dbw->update( 'recentchanges',
-                       array( 
+                       array(
                                'rc_deleted' => $bits,
                                'rc_patrolled' => 1
                        ),
@@ -113,23 +206,25 @@ class RevDel_RevisionItem extends RevDel_Item {
        }
 
        public function isHideCurrentOp( $newBits ) {
-               return ( $newBits & Revision::DELETED_TEXT ) 
+               return ( $newBits & Revision::DELETED_TEXT )
                        && $this->list->getCurrent() == $this->getId();
        }
 
        /**
         * Get the HTML link to the revision text.
         * Overridden by RevDel_ArchiveItem.
+        * @return string
         */
        protected function getRevisionLink() {
-               global $wgLang;
-               $date = $wgLang->timeanddate( $this->revision->getTimestamp(), true );
+               $date = htmlspecialchars( $this->list->getLanguage()->userTimeAndDate(
+                       $this->revision->getTimestamp(), $this->list->getUser() ) );
+
                if ( $this->isDeleted() && !$this->canViewContent() ) {
                        return $date;
                }
-               return $this->special->skin->link(
+               return Linker::linkKnown(
                        $this->list->title,
-                       $date, 
+                       $date,
                        array(),
                        array(
                                'oldid' => $this->revision->getId(),
@@ -141,38 +236,36 @@ class RevDel_RevisionItem extends RevDel_Item {
        /**
         * Get the HTML link to the diff.
         * Overridden by RevDel_ArchiveItem
+        * @return string
         */
        protected function getDiffLink() {
                if ( $this->isDeleted() && !$this->canViewContent() ) {
-                       return wfMsgHtml('diff');
+                       return $this->list->msg( 'diff' )->escaped();
                } else {
-                       return 
-                               $this->special->skin->link( 
-                                       $this->list->title, 
-                                       wfMsgHtml('diff'),
+                       return
+                               Linker::linkKnown(
+                                       $this->list->title,
+                                       $this->list->msg( 'diff' )->escaped(),
                                        array(),
                                        array(
                                                'diff' => $this->revision->getId(),
                                                'oldid' => 'prev',
                                                'unhide' => 1
-                                       ),
-                                       array(
-                                               'known',
-                                               'noclasses'
                                        )
                                );
                }
        }
 
        public function getHTML() {
-               $difflink = $this->getDiffLink();
+               $difflink = $this->list->msg( 'parentheses' )
+                       ->rawParams( $this->getDiffLink() )->escaped();
                $revlink = $this->getRevisionLink();
-               $userlink = $this->special->skin->revUserLink( $this->revision );
-               $comment = $this->special->skin->revComment( $this->revision );
+               $userlink = Linker::revUserLink( $this->revision );
+               $comment = Linker::revComment( $this->revision );
                if ( $this->isDeleted() ) {
                        $revlink = "<span class=\"history-deleted\">$revlink</span>";
                }
-               return "<li>($difflink) $revlink $userlink $comment</li>";
+               return "<li>$difflink $revlink $userlink $comment</li>";
        }
 }
 
@@ -180,12 +273,18 @@ class RevDel_RevisionItem extends RevDel_Item {
  * List for archive table items, i.e. revisions deleted via action=delete
  */
 class RevDel_ArchiveList extends RevDel_RevisionList {
-       var $type = 'archive';
-       var $idField = 'ar_timestamp';
-       var $dateField = 'ar_timestamp';
-       var $authorIdField = 'ar_user';
-       var $authorNameField = 'ar_user_text';
+       public function getType() {
+               return 'archive';
+       }
 
+       public static function getRelationType() {
+               return 'ar_timestamp';
+       }
+
+       /**
+        * @param $db DatabaseBase
+        * @return mixed
+        */
        public function doQuery( $db ) {
                $timestamps = array();
                foreach ( $this->ids as $id ) {
@@ -220,56 +319,115 @@ class RevDel_ArchiveList extends RevDel_RevisionList {
  */
 class RevDel_ArchiveItem extends RevDel_RevisionItem {
        public function __construct( $list, $row ) {
-               parent::__construct( $list, $row );
+               RevDel_Item::__construct( $list, $row );
                $this->revision = Revision::newFromArchiveRow( $row,
-                       array( 'page' => $this->list->title->getArticleId() ) );
+                       array( 'page' => $this->list->title->getArticleID() ) );
+       }
+
+       public function getIdField() {
+               return 'ar_timestamp';
+       }
+
+       public function getTimestampField() {
+               return 'ar_timestamp';
+       }
+
+       public function getAuthorIdField() {
+               return 'ar_user';
+       }
+
+       public function getAuthorNameField() {
+               return 'ar_user_text';
        }
 
        public function getId() {
                # Convert DB timestamp to MW timestamp
                return $this->revision->getTimestamp();
        }
-       
+
        public function setBits( $bits ) {
                $dbw = wfGetDB( DB_MASTER );
                $dbw->update( 'archive',
                        array( 'ar_deleted' => $bits ),
-                       array( 'ar_namespace' => $this->list->title->getNamespace(),
-                               'ar_title'     => $this->list->title->getDBkey(),
+                       array(
+                               'ar_namespace'  => $this->list->title->getNamespace(),
+                               'ar_title'      => $this->list->title->getDBkey(),
                                // use timestamp for index
-                               'ar_timestamp' => $this->row->ar_timestamp,
-                               'ar_rev_id'    => $this->row->ar_rev_id,
-                               'ar_deleted' => $this->getBits()
+                               'ar_timestamp'  => $this->row->ar_timestamp,
+                               'ar_rev_id'     => $this->row->ar_rev_id,
+                               'ar_deleted'    => $this->getBits()
                        ),
                        __METHOD__ );
                return (bool)$dbw->affectedRows();
        }
 
        protected function getRevisionLink() {
-               global $wgLang;
-               $undelete = SpecialPage::getTitleFor( 'Undelete' );
-               $date = $wgLang->timeanddate( $this->revision->getTimestamp(), true );
+               $date = htmlspecialchars( $this->list->getLanguage()->userTimeAndDate(
+                       $this->revision->getTimestamp(), $this->list->getUser() ) );
+
                if ( $this->isDeleted() && !$this->canViewContent() ) {
                        return $date;
                }
-               return $this->special->skin->link( $undelete, $date, array(),
+
+               return Linker::link(
+                       SpecialPage::getTitleFor( 'Undelete' ),
+                       $date,
+                       array(),
                        array(
                                'target' => $this->list->title->getPrefixedText(),
                                'timestamp' => $this->revision->getTimestamp()
-                       ) );
+                       )
+               );
        }
 
        protected function getDiffLink() {
                if ( $this->isDeleted() && !$this->canViewContent() ) {
-                       return wfMsgHtml( 'diff' );
+                       return $this->list->msg( 'diff' )->escaped();
                }
-               $undelete = SpecialPage::getTitleFor( 'Undelete' );             
-               return $this->special->skin->link( $undelete, wfMsgHtml('diff'), array(), 
+
+               return Linker::link(
+                       SpecialPage::getTitleFor( 'Undelete' ),
+                       $this->list->msg( 'diff' )->escaped(),
+                       array(),
                        array(
                                'target' => $this->list->title->getPrefixedText(),
                                'diff' => 'prev',
                                'timestamp' => $this->revision->getTimestamp()
-                       ) );
+                       )
+               );
+       }
+}
+
+
+/**
+ * Item class for a archive table row by ar_rev_id -- actually
+ * used via RevDel_RevisionList.
+ */
+class RevDel_ArchivedRevisionItem extends RevDel_ArchiveItem {
+       public function __construct( $list, $row ) {
+               RevDel_Item::__construct( $list, $row );
+
+               $this->revision = Revision::newFromArchiveRow( $row,
+                       array( 'page' => $this->list->title->getArticleID() ) );
+       }
+
+       public function getIdField() {
+               return 'ar_rev_id';
+       }
+
+       public function getId() {
+               return $this->revision->getId();
+       }
+
+       public function setBits( $bits ) {
+               $dbw = wfGetDB( DB_MASTER );
+               $dbw->update( 'archive',
+                       array( 'ar_deleted' => $bits ),
+                       array( 'ar_rev_id' => $this->row->ar_rev_id,
+                                  'ar_deleted' => $this->getBits()
+                       ),
+                       __METHOD__ );
+               return (bool)$dbw->affectedRows();
        }
 }
 
@@ -277,13 +435,20 @@ class RevDel_ArchiveItem extends RevDel_RevisionItem {
  * List for oldimage table items
  */
 class RevDel_FileList extends RevDel_List {
-       var $type = 'oldimage';
-       var $idField = 'oi_archive_name';
-       var $dateField = 'oi_timestamp';
-       var $authorIdField = 'oi_user';
-       var $authorNameField = 'oi_user_text';
+       public function getType() {
+               return 'oldimage';
+       }
+
+       public static function getRelationType() {
+               return 'oi_archive_name';
+       }
+
        var $storeBatch, $deleteBatch, $cleanupBatch;
 
+       /**
+        * @param $db DatabaseBase
+        * @return mixed
+        */
        public function doQuery( $db ) {
                $archiveNames = array();
                foreach( $this->ids as $timestamp ) {
@@ -348,6 +513,10 @@ class RevDel_FileList extends RevDel_List {
  * Item class for an oldimage table row
  */
 class RevDel_FileItem extends RevDel_Item {
+
+       /**
+        * @var File
+        */
        var $file;
 
        public function __construct( $list, $row ) {
@@ -355,17 +524,33 @@ class RevDel_FileItem extends RevDel_Item {
                $this->file = RepoGroup::singleton()->getLocalRepo()->newFileFromRow( $row );
        }
 
+       public function getIdField() {
+               return 'oi_archive_name';
+       }
+
+       public function getTimestampField() {
+               return 'oi_timestamp';
+       }
+
+       public function getAuthorIdField() {
+               return 'oi_user';
+       }
+
+       public function getAuthorNameField() {
+               return 'oi_user_text';
+       }
+
        public function getId() {
                $parts = explode( '!', $this->row->oi_archive_name );
                return $parts[0];
        }
 
        public function canView() {
-               return $this->file->userCan( File::DELETED_RESTRICTED );
+               return $this->file->userCan( File::DELETED_RESTRICTED, $this->list->getUser() );
        }
-       
+
        public function canViewContent() {
-               return $this->file->userCan( File::DELETED_FILE );
+               return $this->file->userCan( File::DELETED_FILE, $this->list->getUser() );
        }
 
        public function getBits() {
@@ -374,7 +559,7 @@ class RevDel_FileItem extends RevDel_Item {
 
        public function setBits( $bits ) {
                # Queue the file op
-               # FIXME: move to LocalFile.php
+               # @todo FIXME: Move to LocalFile.php
                if ( $this->isDeleted() ) {
                        if ( $bits & File::DELETED_FILE ) {
                                # Still deleted
@@ -395,12 +580,12 @@ class RevDel_FileItem extends RevDel_Item {
                        $dstRel = $this->file->repo->getDeletedHashPath( $key ) . $key;
                        $this->list->deleteBatch[] = array( $this->file->getRel(), $dstRel );
                }
-               
+
                # Do the database operations
                $dbw = wfGetDB( DB_MASTER );
                $dbw->update( 'oldimage',
                        array( 'oi_deleted' => $bits ),
-                       array( 
+                       array(
                                'oi_name' => $this->row->oi_name,
                                'oi_timestamp' => $this->row->oi_timestamp,
                                'oi_deleted' => $this->getBits()
@@ -415,43 +600,47 @@ class RevDel_FileItem extends RevDel_Item {
        }
 
        /**
-        * Get the link to the file. 
+        * Get the link to the file.
         * Overridden by RevDel_ArchivedFileItem.
+        * @return string
         */
        protected function getLink() {
-               global $wgLang, $wgUser;
-               $date = $wgLang->timeanddate( $this->file->getTimestamp(), true  );             
-               if ( $this->isDeleted() ) {
-                       # Hidden files...
-                       if ( !$this->canViewContent() ) {
-                               $link = $date;
-                       } else {
-                               $link = $this->special->skin->link( 
-                                       $this->special->getTitle(), 
-                                       $date, array(), 
-                                       array(
-                                               'target' => $this->list->title->getPrefixedText(),
-                                               'file'   => $this->file->getArchiveName(),
-                                               'token'  => $wgUser->editToken( $this->file->getArchiveName() )
-                                       )
-                               );
-                       }
-                       return '<span class="history-deleted">' . $link . '</span>';
-               } else {
+               $date = htmlspecialchars( $this->list->getLanguage()->userTimeAndDate(
+                       $this->file->getTimestamp(), $this->list->getUser() ) );
+
+               if ( !$this->isDeleted() ) {
                        # Regular files...
-                       return Xml::element( 'a', array( 'href' => $this->file->getUrl() ), $date );
+                       return Html::rawElement( 'a', array( 'href' => $this->file->getUrl() ), $date );
+               }
+
+               # Hidden files...
+               if ( !$this->canViewContent() ) {
+                       $link = $date;
+               } else {
+                       $link = Linker::link(
+                               SpecialPage::getTitleFor( 'Revisiondelete' ),
+                               $date,
+                               array(),
+                               array(
+                                       'target' => $this->list->title->getPrefixedText(),
+                                       'file'   => $this->file->getArchiveName(),
+                                       'token'  => $this->list->getUser()->getEditToken(
+                                               $this->file->getArchiveName() )
+                               )
+                       );
                }
+               return '<span class="history-deleted">' . $link . '</span>';
        }
        /**
         * Generate a user tool link cluster if the current user is allowed to view it
         * @return string HTML
         */
        protected function getUserTools() {
-               if( $this->file->userCan( Revision::DELETED_USER ) ) {
-                       $link = $this->special->skin->userLink( $this->file->user, $this->file->user_text ) .
-                               $this->special->skin->userToolLinks( $this->file->user, $this->file->user_text );
+               if( $this->file->userCan( Revision::DELETED_USER, $this->list->getUser() ) ) {
+                       $link = Linker::userLink( $this->file->user, $this->file->user_text ) .
+                               Linker::userToolLinks( $this->file->user, $this->file->user_text );
                } else {
-                       $link = wfMsgHtml( 'rev-deleted-user' );
+                       $link = $this->list->msg( 'rev-deleted-user' )->escaped();
                }
                if( $this->file->isDeleted( Revision::DELETED_USER ) ) {
                        return '<span class="history-deleted">' . $link . '</span>';
@@ -466,10 +655,10 @@ class RevDel_FileItem extends RevDel_Item {
         * @return string HTML
         */
        protected function getComment() {
-               if( $this->file->userCan( File::DELETED_COMMENT ) ) {
-                       $block = $this->special->skin->commentBlock( $this->file->description );
+               if( $this->file->userCan( File::DELETED_COMMENT, $this->list->getUser() ) ) {
+                       $block = Linker::commentBlock( $this->file->description );
                } else {
-                       $block = ' ' . wfMsgHtml( 'rev-deleted-comment' );
+                       $block = ' ' . $this->list->msg( 'rev-deleted-comment' )->escaped();
                }
                if( $this->file->isDeleted( File::DELETED_COMMENT ) ) {
                        return "<span class=\"history-deleted\">$block</span>";
@@ -478,16 +667,10 @@ class RevDel_FileItem extends RevDel_Item {
        }
 
        public function getHTML() {
-               global $wgLang;
-               $data = 
-                       wfMsg(
-                               'widthheight', 
-                               $wgLang->formatNum( $this->file->getWidth() ),
-                               $wgLang->formatNum( $this->file->getHeight() ) 
-                       ) .
-                       ' (' . 
-                       wfMsgExt( 'nbytes', 'parsemag', $wgLang->formatNum( $this->file->getSize() ) ) . 
-                       ')';
+               $data =
+                       $this->list->msg( 'widthheight' )->numParams(
+                               $this->file->getWidth(), $this->file->getHeight() )->text() .
+                       ' (' . $this->list->msg( 'nbytes' )->numParams( $this->file->getSize() )->text() . ')';
 
                return '<li>' . $this->getLink() . ' ' . $this->getUserTools() . ' ' .
                        $data . ' ' . $this->getComment(). '</li>';
@@ -498,12 +681,18 @@ class RevDel_FileItem extends RevDel_Item {
  * List for filearchive table items
  */
 class RevDel_ArchivedFileList extends RevDel_FileList {
-       var $type = 'filearchive';
-       var $idField = 'fa_id';
-       var $dateField = 'fa_timestamp';
-       var $authorIdField = 'fa_user';
-       var $authorNameField = 'fa_user_text';
-       
+       public function getType() {
+               return 'filearchive';
+       }
+
+       public static function getRelationType() {
+               return 'fa_id';
+       }
+
+       /**
+        * @param $db DatabaseBase
+        * @return mixed
+        */
        public function doQuery( $db ) {
                $ids = array_map( 'intval', $this->ids );
                return $db->select( 'filearchive', '*',
@@ -526,10 +715,26 @@ class RevDel_ArchivedFileList extends RevDel_FileList {
  */
 class RevDel_ArchivedFileItem extends RevDel_FileItem {
        public function __construct( $list, $row ) {
-               parent::__construct( $list, $row );
+               RevDel_Item::__construct( $list, $row );
                $this->file = ArchivedFile::newFromRow( $row );
        }
 
+       public function getIdField() {
+               return 'fa_id';
+       }
+
+       public function getTimestampField() {
+               return 'fa_timestamp';
+       }
+
+       public function getAuthorIdField() {
+               return 'fa_user';
+       }
+
+       public function getAuthorNameField() {
+               return 'fa_user_text';
+       }
+
        public function getId() {
                return $this->row->fa_id;
        }
@@ -548,19 +753,20 @@ class RevDel_ArchivedFileItem extends RevDel_FileItem {
        }
 
        protected function getLink() {
-               global $wgLang, $wgUser;
-               $date = $wgLang->timeanddate( $this->file->getTimestamp(), true  );
-               $undelete = SpecialPage::getTitleFor( 'Undelete' );
-               $key = $this->file->getKey();
+               $date = htmlspecialchars( $this->list->getLanguage()->userTimeAndDate(
+                       $this->file->getTimestamp(), $this->list->getUser() ) );
+
                # Hidden files...
                if( !$this->canViewContent() ) {
                        $link = $date;
                } else {
-                       $link = $this->special->skin->link( $undelete, $date, array(),
+                       $undelete = SpecialPage::getTitleFor( 'Undelete' );
+                       $key = $this->file->getKey();
+                       $link = Linker::link( $undelete, $date, array(),
                                array(
                                        'target' => $this->list->title->getPrefixedText(),
                                        'file' => $key,
-                                       'token' => $wgUser->editToken( $key )
+                                       'token' => $this->list->getUser()->getEditToken( $key )
                                )
                        );
                }
@@ -575,12 +781,18 @@ class RevDel_ArchivedFileItem extends RevDel_FileItem {
  * List for logging table items
  */
 class RevDel_LogList extends RevDel_List {
-       var $type = 'logging';
-       var $idField = 'log_id';
-       var $dateField = 'log_timestamp';
-       var $authorIdField = 'log_user';
-       var $authorNameField = 'log_user_text';
+       public function getType() {
+               return 'logging';
+       }
+
+       public static function getRelationType() {
+               return 'log_id';
+       }
 
+       /**
+        * @param $db DatabaseBase
+        * @return mixed
+        */
        public function doQuery( $db ) {
                $ids = array_map( 'intval', $this->ids );
                return $db->select( 'logging', '*',
@@ -615,10 +827,26 @@ class RevDel_LogList extends RevDel_List {
  * Item class for a logging table row
  */
 class RevDel_LogItem extends RevDel_Item {
+       public function getIdField() {
+               return 'log_id';
+       }
+
+       public function getTimestampField() {
+               return 'log_timestamp';
+       }
+
+       public function getAuthorIdField() {
+               return 'log_user';
+       }
+
+       public function getAuthorNameField() {
+               return 'log_user_text';
+       }
+
        public function canView() {
-               return LogEventsList::userCan( $this->row, Revision::DELETED_RESTRICTED );
+               return LogEventsList::userCan( $this->row, Revision::DELETED_RESTRICTED, $this->list->getUser() );
        }
-       
+
        public function canViewContent() {
                return true; // none
        }
@@ -630,9 +858,9 @@ class RevDel_LogItem extends RevDel_Item {
        public function setBits( $bits ) {
                $dbw = wfGetDB( DB_MASTER );
                $dbw->update( 'recentchanges',
-                       array( 
-                               'rc_deleted' => $bits, 
-                               'rc_patrolled' => 1 
+                       array(
+                               'rc_deleted' => $bits,
+                               'rc_patrolled' => 1
                        ),
                        array(
                                'rc_logid' => $this->row->log_id,
@@ -652,39 +880,29 @@ class RevDel_LogItem extends RevDel_Item {
        }
 
        public function getHTML() {
-               global $wgLang;
-
-               $date = htmlspecialchars( $wgLang->timeanddate( $this->row->log_timestamp ) );
-               $paramArray = LogPage::extractParams( $this->row->log_params );
+               $date = htmlspecialchars( $this->list->getLanguage()->userTimeAndDate(
+                       $this->row->log_timestamp, $this->list->getUser() ) );
                $title = Title::makeTitle( $this->row->log_namespace, $this->row->log_title );
+               $formatter = LogFormatter::newFromRow( $this->row );
+               $formatter->setContext( $this->list->getContext() );
+               $formatter->setAudience( LogFormatter::FOR_THIS_USER );
 
                // Log link for this page
-               $loglink = $this->special->skin->link(
+               $loglink = Linker::link(
                        SpecialPage::getTitleFor( 'Log' ),
-                       wfMsgHtml( 'log' ),
+                       $this->list->msg( 'log' )->escaped(),
                        array(),
                        array( 'page' => $title->getPrefixedText() )
                );
-               // Action text
-               if( !$this->canView() ) {
-                       $action = '<span class="history-deleted">' . wfMsgHtml('rev-deleted-event') . '</span>';
-               } else {
-                       $action = LogPage::actionText( $this->row->log_type, $this->row->log_action, $title,
-                               $this->special->skin, $paramArray, true, true );
-                       if( $this->row->log_deleted & LogPage::DELETED_ACTION )
-                               $action = '<span class="history-deleted">' . $action . '</span>';
-               }
-               // User links
-               $userLink = $this->special->skin->userLink( $this->row->log_user,
-                       User::WhoIs( $this->row->log_user ) );
-               if( LogEventsList::isDeleted($this->row,LogPage::DELETED_USER) ) {
-                       $userLink = '<span class="history-deleted">' . $userLink . '</span>';
-               }
+               $loglink = $this->list->msg( 'parentheses' )->rawParams( $loglink )->escaped();
+               // User links and action text
+               $action = $formatter->getActionText();
                // Comment
-               $comment = $wgLang->getDirMark() . $this->special->skin->commentBlock( $this->row->log_comment );
+               $comment = $this->list->getLanguage()->getDirMark() . Linker::commentBlock( $this->row->log_comment );
                if( LogEventsList::isDeleted($this->row,LogPage::DELETED_COMMENT) ) {
                        $comment = '<span class="history-deleted">' . $comment . '</span>';
                }
-               return "<li>($loglink) $date $userLink $action $comment</li>";
+
+               return "<li>$loglink $date $action $comment</li>";
        }
 }