Merge "Improve docs for Title::getInternalURL/getCanonicalURL"

[lhc/web/wiklou.git] / includes / changes / ChangesList.php

diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php
index b8ab971..184a2c1 100644 (file)
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@ -289,7 +289,10 @@ class ChangesList extends ContextSource {
                $this->rcCacheIndex = 0;
                $this->lastdate = '';
                $this->rclistOpen = false;
-               $this->getOutput()->addModuleStyles( 'mediawiki.special.changeslist' );
+               $this->getOutput()->addModuleStyles( [
+                       'mediawiki.interface.helpers.styles',
+                       'mediawiki.special.changeslist'
+               ] );
 
                return '<div class="mw-changeslist">';
        }
@@ -392,6 +395,36 @@ class ChangesList extends ContextSource {
                return $out;
        }
 
+       /**
+        * Render the date and time of a revision in the current user language
+        * based on whether the user is able to view this information or not.
+        * @param Revision $rev
+        * @param User $user
+        * @param Language $lang
+        * @param Title|null $title (optional) where Title does not match
+        *   the Title associated with the Revision
+        * @internal For usage by Pager classes only (e.g. HistoryPager and ContribsPager).
+        * @return string HTML
+        */
+       public static function revDateLink( Revision $rev, User $user, Language $lang, $title = null ) {
+               $ts = $rev->getTimestamp();
+               $date = $lang->userTimeAndDate( $ts, $user );
+               if ( $rev->userCan( Revision::DELETED_TEXT, $user ) ) {
+                       $link = MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
+                               $title !== null ? $title : $rev->getTitle(),
+                               $date,
+                               [ 'class' => 'mw-changeslist-date' ],
+                               [ 'oldid' => $rev->getId() ]
+                       );
+               } else {
+                       $link = htmlspecialchars( $date );
+               }
+               if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+                       $link = "<span class=\"history-deleted mw-changeslist-date\">$link</span>";
+               }
+               return $link;
+       }
+
        /**
         * @param string &$s HTML to update
         * @param mixed $rc_timestamp
@@ -514,6 +547,7 @@ class ChangesList extends ContextSource {
         * and a separator
         *
         * @param RecentChange $rc
+        * @deprecated use revDateLink instead.
         * @return string HTML fragment
         */
        public function getTimestamp( $rc ) {
@@ -583,7 +617,13 @@ class ChangesList extends ContextSource {
                        return ' <span class="history-deleted">' .
                                $this->msg( 'rev-deleted-comment' )->escaped() . '</span>';
                } else {
-                       return Linker::commentBlock( $rc->mAttribs['rc_comment'], $rc->getTitle() );
+                       return Linker::commentBlock( $rc->mAttribs['rc_comment'], $rc->getTitle(),
+                               // Whether section links should refer to local page (using default false)
+                               false,
+                               // wikid to generate links for (using default null) */
+                               null,
+                               // whether parentheses should be rendered as part of the message
+                               false );
                }
        }