Changed calls to Linker::tooltipAndAccesskeyAttribs() to be static and fixed casing...

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

diff --git a/includes/HistoryPage.php b/includes/HistoryPage.php
index d5991aa..678c24b 100644 (file)
--- a/includes/HistoryPage.php
+++ b/includes/HistoryPage.php
@@ -397,24 +397,20 @@ class HistoryPager extends ReverseChronologicalPager {
                $this->buttons = '<div>';
                $this->buttons .= $this->submitButton( wfMsg( 'compareselectedversions' ),
                        array( 'class' => 'historysubmit' )
-                               + $wgUser->getSkin()->tooltipAndAccessKeyAttribs( 'compareselectedversions' )
+                               + Linker::tooltipAndAccesskeyAttribs( 'compareselectedversions' )
                ) . "\n";
 
                if ( $wgUser->isAllowed( 'deleterevision' ) ) {
                        $s .= $this->getRevisionButton( 'revisiondelete', 'showhideselectedversions' );
                }
-               if ( $wgUser->isAllowed( 'revisionmove' ) ) {
-                       $s .= $this->getRevisionButton( 'revisionmove', 'revisionmoveselectedversions' );
-               }
                $this->buttons .= '</div>';
                $s .= '</div><ul id="pagehistory">' . "\n";
                return $s;
        }
 
        private function getRevisionButton( $name, $msg ) {
-               global $wgContLang;
                $this->preventClickjacking();
-               $float = $wgContLang->alignEnd();
+               $float = wfUILang()->alignEnd();
                # Note bug #20966, <button> is non-standard in IE<8
                $element = Html::element( 'button',
                        array(
@@ -510,11 +506,10 @@ class HistoryPager extends ReverseChronologicalPager {
 
                $del = '';
                // Show checkboxes for each revision
-               if ( $wgUser->isAllowed( 'deleterevision', 'revisionmove' ) ) {
+               if ( $wgUser->isAllowed( 'deleterevision' ) ) {
                        $this->preventClickjacking();
                        // If revision was hidden from sysops, disable the checkbox
-                       // However, if the user has revisionmove rights, we cannot disable the checkbox
-                       if ( !$rev->userCan( Revision::DELETED_RESTRICTED ) && !$wgUser->isAllowed( 'revisionmove' ) ) {
+                       if ( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
                                $del = Xml::check( 'deleterevisions', false, array( 'disabled' => 'disabled' ) );
                        // Otherwise, enable the checkbox...
                        } else {
@@ -522,7 +517,7 @@ class HistoryPager extends ReverseChronologicalPager {
                                        array( 'name' => 'ids[' . $rev->getId() . ']' ) );
                        }
                // User can only view deleted revisions...
-               } else if ( $rev->getVisibility() && $wgUser->isAllowed( 'deletedhistory' ) ) {
+               } elseif ( $rev->getVisibility() && $wgUser->isAllowed( 'deletedhistory' ) ) {
                        // If revision was hidden from sysops, disable the link
                        if ( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
                                $cdel = $this->getSkin()->revDeleteLinkDisabled( false );
@@ -538,9 +533,13 @@ class HistoryPager extends ReverseChronologicalPager {
                        $s .= " $del ";
                }
 
+               $dirmark = wfUILang()->getDirMark();
+
                $s .= " $link";
+               $s .= $dirmark;
                $s .= " <span class='history-user'>" .
                        $this->getSkin()->revUserTools( $rev, true ) . "</span>";
+               $s .= $dirmark;
 
                if ( $rev->isMinor() ) {
                        $s .= ' ' . ChangesList::flag( 'minor' );
@@ -730,7 +729,7 @@ class HistoryPager extends ReverseChronologicalPager {
                                if ( !$rev->userCan( Revision::DELETED_TEXT ) ) {
                                        $radio['disabled'] = 'disabled';
                                        $checkmark = array(); // We will check the next possible one
-                               } else if ( !$this->oldIdChecked ) {
+                               } elseif ( !$this->oldIdChecked ) {
                                        $checkmark = array( 'checked' => 'checked' );
                                        $this->oldIdChecked = $id;
                                } else {