Merge "Title: Refactor JS/CSS page handling to be more sane"

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

diff --git a/includes/revisiondelete/RevDelRevisionItem.php b/includes/revisiondelete/RevDelRevisionItem.php
index e52d07c..a9753b4 100644 (file)
--- a/includes/revisiondelete/RevDelRevisionItem.php
+++ b/includes/revisiondelete/RevDelRevisionItem.php
@@ -63,12 +63,12 @@ class RevDelRevisionItem extends RevDelItem {
                $dbw = wfGetDB( DB_MASTER );
                // Update revision table
                $dbw->update( 'revision',
-                       array( 'rev_deleted' => $bits ),
-                       array(
+                       [ 'rev_deleted' => $bits ],
+                       [
                                'rev_id' => $this->revision->getId(),
                                'rev_page' => $this->revision->getPage(),
                                'rev_deleted' => $this->getBits() // cas
-                       ),
+                       ],
                        __METHOD__
                );
                if ( !$dbw->affectedRows() ) {
@@ -77,15 +77,15 @@ class RevDelRevisionItem extends RevDelItem {
                }
                // Update recentchanges table
                $dbw->update( 'recentchanges',
-                       array(
+                       [
                                'rc_deleted' => $bits,
                                'rc_patrolled' => 1
-                       ),
-                       array(
+                       ],
+                       [
                                'rc_this_oldid' => $this->revision->getId(), // condition
                                // non-unique timestamp index
                                'rc_timestamp' => $dbw->timestamp( $this->revision->getTimestamp() ),
-                       ),
+                       ],
                        __METHOD__
                );
 
@@ -107,21 +107,21 @@ class RevDelRevisionItem extends RevDelItem {
         * @return string
         */
        protected function getRevisionLink() {
-               $date = htmlspecialchars( $this->list->getLanguage()->userTimeAndDate(
-                       $this->revision->getTimestamp(), $this->list->getUser() ) );
+               $date = $this->list->getLanguage()->userTimeAndDate(
+                       $this->revision->getTimestamp(), $this->list->getUser() );
 
                if ( $this->isDeleted() && !$this->canViewContent() ) {
-                       return $date;
+                       return htmlspecialchars( $date );
                }
 
-               return Linker::linkKnown(
+               return $this->getLinkRenderer()->makeKnownLink(
                        $this->list->title,
                        $date,
-                       array(),
-                       array(
+                       [],
+                       [
                                'oldid' => $this->revision->getId(),
                                'unhide' => 1
-                       )
+                       ]
                );
        }
 
@@ -134,15 +134,15 @@ class RevDelRevisionItem extends RevDelItem {
                if ( $this->isDeleted() && !$this->canViewContent() ) {
                        return $this->list->msg( 'diff' )->escaped();
                } else {
-                       return Linker::linkKnown(
+                       return $this->getLinkRenderer()->makeKnownLink(
                                        $this->list->title,
-                                       $this->list->msg( 'diff' )->escaped(),
-                                       array(),
-                                       array(
+                                       $this->list->msg( 'diff' )->text(),
+                                       [],
+                                       [
                                                'diff' => $this->revision->getId(),
                                                'oldid' => 'prev',
                                                'unhide' => 1
-                                       )
+                                       ]
                                );
                }
        }
@@ -161,10 +161,14 @@ class RevDelRevisionItem extends RevDelItem {
                        $revlink = "<span class=\"history-deleted\">$revlink</span>";
                }
                $content = "$difflink $revlink $userlink $comment";
-               $attribs = array();
+               $attribs = [];
                $tags = $this->getTags();
                if ( $tags ) {
-                       list( $tagSummary, $classes ) = ChangeTags::formatSummaryRow( $tags, 'revisiondelete' );
+                       list( $tagSummary, $classes ) = ChangeTags::formatSummaryRow(
+                               $tags,
+                               'revisiondelete',
+                               $this->list->getContext()
+                       );
                        $content .= " $tagSummary";
                        $attribs['class'] = implode( ' ', $classes );
                }
@@ -181,23 +185,23 @@ class RevDelRevisionItem extends RevDelItem {
        public function getApiData( ApiResult $result ) {
                $rev = $this->revision;
                $user = $this->list->getUser();
-               $ret = array(
+               $ret = [
                        'id' => $rev->getId(),
                        'timestamp' => wfTimestamp( TS_ISO_8601, $rev->getTimestamp() ),
-               );
-               $ret += $rev->isDeleted( Revision::DELETED_USER ) ? array( 'userhidden' => '' ) : array();
-               $ret += $rev->isDeleted( Revision::DELETED_COMMENT ) ? array( 'commenthidden' => '' ) : array();
-               $ret += $rev->isDeleted( Revision::DELETED_TEXT ) ? array( 'texthidden' => '' ) : array();
+                       'userhidden' => (bool)$rev->isDeleted( Revision::DELETED_USER ),
+                       'commenthidden' => (bool)$rev->isDeleted( Revision::DELETED_COMMENT ),
+                       'texthidden' => (bool)$rev->isDeleted( Revision::DELETED_TEXT ),
+               ];
                if ( $rev->userCan( Revision::DELETED_USER, $user ) ) {
-                       $ret += array(
+                       $ret += [
                                'userid' => $rev->getUser( Revision::FOR_THIS_USER ),
                                'user' => $rev->getUserText( Revision::FOR_THIS_USER ),
-                       );
+                       ];
                }
                if ( $rev->userCan( Revision::DELETED_COMMENT, $user ) ) {
-                       $ret += array(
+                       $ret += [
                                'comment' => $rev->getComment( Revision::FOR_THIS_USER ),
-                       );
+                       ];
                }
 
                return $ret;