Forgot to commit the change to showhideminor. Also removing commented-out strings.

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

diff --git a/includes/PageHistory.php b/includes/PageHistory.php
index c96ab31..13c1b44 100644 (file)
--- a/includes/PageHistory.php
+++ b/includes/PageHistory.php
@@ -54,15 +54,20 @@ class PageHistory {
                
                $namespace = $this->mTitle->getNamespace();
                $title = $this->mTitle->getText();
+               
+               $db =& wfGetDB( DB_SLAVE );
+               $use_index = $db->useIndexClause( 'name_title_timestamp' );
+               $oldtable = $db->tableName( 'old' );
+
                $sql = "SELECT old_id,old_user," .
                  "old_comment,old_user_text,old_timestamp,old_minor_edit ".
-                 "FROM old USE INDEX (name_title_timestamp) " .
+                 "FROM $oldtable $use_index " .
                  "WHERE old_namespace={$namespace} AND " .
-                 "old_title='" . wfStrencode( $this->mTitle->getDBkey() ) . "' " .
-                 "ORDER BY inverse_timestamp LIMIT $rawoffset, $limitplus";
-               $res = wfQuery( $sql, DB_READ, $fname );
+                 "old_title='" . $db->strencode( $this->mTitle->getDBkey() ) . "' " .
+                 "ORDER BY inverse_timestamp".wfLimitResult($limitplus,$rawoffset);
+               $res = $db->query( $sql, $fname );
 
-               $revs = wfNumRows( $res );
+               $revs = $db->numRows( $res );
                
                if( $revs < $limitplus ) // the sql above tries to fetch one extra
                        $this->linesonpage = $revs;
@@ -77,6 +82,12 @@ class PageHistory {
                        $this->mTitle->getPrefixedText(),
                        "action=history", $atend );
                $s = $numbar;
+               if($this->linesonpage > 0) {
+                       $submitpart1 = '<input class="historysubmit" type="submit" accesskey="'.wfMsg('accesskey-compareselectedversions').
+                       '" title="'.wfMsg('tooltip-compareselectedversions').'" value="'.wfMsg('compareselectedversions').'"';
+                       $this->submitbuttonhtml1 = $submitpart1 . ' />';
+                       $this->submitbuttonhtml2 = $submitpart1 . ' id="historysubmit" />';
+               }
                $s .= $this->beginHistoryList();
                $counter = 1;
                if( $offset == 0 ){
@@ -90,7 +101,7 @@ class PageHistory {
                                $counter++
                        );
                }
-               while ( $line = wfFetchObject( $res ) ) {
+               while ( $line = $db->fetchObject( $res ) ) {
                        $s .= $this->historyLine( 
                                $line->old_timestamp, $line->old_user,
                                $line->old_user_text, $namespace,
@@ -110,9 +121,10 @@ class PageHistory {
                global $wgTitle;
                $this->lastdate = $this->lastline = "";
                $s = "\n<p>" . wfMsg( "histlegend" ).'</p>'; 
-               $s .="\n<form id=\"pagehistory\" name=\"pagehistory\" action=\"" . $wgTitle->getFullURL("-") . "\" method=\"get\">";
-               $s .= "<input type=\"hidden\" name=\"title\" value=\"".urlencode($wgTitle->getPrefixedDbKey())."\"/>\n";
-               $s .= "" . "\n<ul>";
+               $s .="\n<form action=\"" . $wgTitle->escapeLocalURL( '-' ) . "\" method=\"get\">";
+               $s .= "<input type=\"hidden\" name=\"title\" value=\"".wfEscapeHTML($wgTitle->getPrefixedDbKey())."\"/>\n";
+               $s .= !empty($this->submitbuttonhtml1) ? $this->submitbuttonhtml1."\n":'';
+               $s .= "" . "\n<ul id=\"pagehistory\" >";
                return $s;
        }
 
@@ -121,10 +133,8 @@ class PageHistory {
                $last = wfMsg( "last" );
 
                $s = $skip ? "" : preg_replace( "/!OLDID![0-9]+!/", $last, $this->lastline );
-               $s .= "</ul>\n";
-               if( $this->linesonpage > 1) {
-                       $s .= '<button type="submit">'.wfMsg('compareselectedversions')."</button><br/><br/>\n";
-               }
+               $s .= "</ul>";
+               $s .= !empty($this->submitbuttonhtml2) ? $this->submitbuttonhtml2."\n":'';
                $s .= "</form>\n";
                return $s;
        }
@@ -155,10 +165,10 @@ class PageHistory {
 
                if ( 0 == $u ) {
                        $ul = $this->mSkin->makeKnownLink( $wgLang->specialPage( "Contributions" ),
-                               $ut, "target=" . $ut );
+                               htmlspecialchars( $ut ), "target=" . urlencode( $ut ) );
                } else { 
                        $ul = $this->mSkin->makeLink( $wgLang->getNsText(
-                               Namespace::getUser() ) . ":{$ut}", $ut );
+                               Namespace::getUser() ) . ":{$ut}", htmlspecialchars( $ut ) );
                }
 
                $s = "<li>";
@@ -182,11 +192,9 @@ class PageHistory {
                        }
                        $arbitrary .= '<input type="radio" name="diff" value="'.$oid.'" title="'.wfMsg('selectnewerversionfordiff').'"'.$checkmark.' />';
                }
-               $M = wfMsg( "minoreditletter" );
-               if ( $isminor ) {
-                       $s .= "<span class='hflag'>{$M}</span>";
-               }
-               $s .= "({$curlink}) (!OLDID!{$oid}!) $arbitrary {$link} <span class='hlinedesc'>{$ul}</span>";
+               $s .= "({$curlink}) (!OLDID!{$oid}!) $arbitrary {$link} <span class='user'>{$ul}</span>";
+               $s .= $isminor ? ' <span class="minor">'.wfMsg( "minoreditletter" ).'</span>': '' ;
+               
 
                if ( "" != $c && "*" != $c ) {