* PageHistory::diffButtons

[lhc/web/wiklou.git] / includes / PageHistory.php

diff --git a/includes/PageHistory.php b/includes/PageHistory.php
index df711c8..5f1388a 100644 (file)
--- a/includes/PageHistory.php
+++ b/includes/PageHistory.php
@@ -70,9 +70,7 @@ class PageHistory {
 
                $logPage = SpecialPage::getTitleFor( 'Log' );
                $logLink = $this->mSkin->makeKnownLinkObj( $logPage, wfMsgHtml( 'viewpagelogs' ), 'page=' . $this->mTitle->getPrefixedUrl() );
-
-               $subtitle = wfMsgHtml( 'revhistory' ) . '<br />' . $logLink;
-               $wgOut->setSubtitle( $subtitle );
+               $wgOut->setSubtitle( $logLink );
 
                $feedType = $wgRequest->getVal( 'feed' );
                if( $feedType ) {
@@ -89,7 +87,6 @@ class PageHistory {
                        return;
                }
 
-               
                /*
                 * "go=first" means to jump to the last (earliest) history page.
                 * This is deprecated, it no longer appears in the user interface
@@ -99,7 +96,7 @@ class PageHistory {
                        $wgOut->redirect( $wgTitle->getLocalURL( "action=history&limit={$limit}&dir=prev" ) );
                        return;
                }
-               
+
                wfRunHooks( 'PageHistoryBeforeList', array( &$this->mArticle ) );
 
                /** 
@@ -222,11 +219,11 @@ class PageHistory {
                        $s .= ' ' . wfElement( 'span', array( 'class' => 'minor' ), wfMsg( 'minoreditletter') );
                }
 
-               if (!is_null($size = $rev->getSize())) {
-                       if ($size == 0)
-                               $stxt = wfMsgHtml('historyempty');
+               if ( !is_null( $size = $rev->getSize() ) ) {
+                       if ( $size == 0 )
+                               $stxt = wfMsgHtml( 'historyempty' );
                        else
-                               $stxt = wfMsgHtml('historysize', $wgLang->formatNum( $size ) );
+                               $stxt = wfMsgExt( 'historysize', array( 'parsemag' ), $wgLang->formatNum( $size ) );
                        $s .= " <span class=\"history-size\">$stxt</span>";
                }
 
@@ -329,14 +326,19 @@ class PageHistory {
                }
        }
 
-       /** @todo document */
+       /**
+        * Create radio buttons for page history
+        *
+        * @param object $rev Revision
+        * @param bool $firstInList Is this version the first one?
+        * @param int $counter A counter of what row number we're at, counted from the top row = 1.
+        * @return string HTML output for the radio buttons
+        */
        function diffButtons( $rev, $firstInList, $counter ) {
                if( $this->linesonpage > 1) {
                        $radio = array(
                                'type'  => 'radio',
                                'value' => $rev->getId(),
-# do we really need to flood this on every item?
-#                              'title' => wfMsgHtml( 'selectolderversionfordiff' )
                        );
 
                        if( !$rev->userCan( Revision::DELETED_TEXT ) ) {
@@ -345,7 +347,7 @@ class PageHistory {
 
                        /** @todo: move title texts to javascript */
                        if ( $firstInList ) {
-                               $first = wfElement( 'input', array_merge(
+                               $first = Xml::element( 'input', array_merge(
                                        $radio,
                                        array(
                                                'style' => 'visibility:hidden',
@@ -357,13 +359,13 @@ class PageHistory {
                                } else {
                                        $checkmark = array();
                                }
-                               $first = wfElement( 'input', array_merge(
+                               $first = Xml::element( 'input', array_merge(
                                        $radio,
                                        $checkmark,
                                        array( 'name'  => 'oldid' ) ) );
                                $checkmark = array();
                        }
-                       $second = wfElement( 'input', array_merge(
+                       $second = Xml::element( 'input', array_merge(
                                $radio,
                                $checkmark,
                                array( 'name'  => 'diff' ) ) );