# This shares a lot of issues (and code) with Recent Changes
function history() {
- global $wgUser, $wgOut, $wgLang;
+ global $wgUser, $wgOut, $wgLang, $wgShowUpdatedMarker;
# If page hasn't changed, client can cache this
$wgOut->setArticleRelated( true );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
- if( $this->mTitle->getArticleID() == 0 ) {
+ $id = $this->mTitle->getArticleID();
+ if( $id == 0 ) {
$wgOut->addHTML( wfMsg( 'nohistory' ) );
wfProfileOut( $fname );
return;
list( $limit, $offset ) = wfCheckLimits();
- /* We have to draw the latest revision from 'cur' */
- $rawlimit = $limit;
- $rawoffset = $offset - 1;
- if( 0 == $offset ) {
- $rawlimit--;
- $rawoffset = 0;
- }
/* Check one extra row to see whether we need to show 'next' and diff links */
- $limitplus = $rawlimit + 1;
+ $limitplus = $limit + 1;
$namespace = $this->mTitle->getNamespace();
$title = $this->mTitle->getText();
-
+ $uid = $wgUser->getID();
$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 $oldtable $use_index " .
- "WHERE old_namespace={$namespace} AND " .
- "old_title='" . $db->strencode( $this->mTitle->getDBkey() ) . "' " .
- "ORDER BY inverse_timestamp".$db->limitResult($limitplus,$rawoffset);
+ if ($uid && $wgShowUpdatedMarker && $wgUser->getOption( 'showupdated' ))
+ $notificationtimestamp = $db->selectField( 'watchlist',
+ 'wl_notificationtimestamp',
+ array( 'wl_namespace' => $namespace, 'wl_title' => $this->mTitle->getDBkey(), 'wl_user' => $uid ),
+ $fname );
+ else $notificationtimestamp = false;
+
+ $use_index = $db->useIndexClause( 'page_timestamp' );
+ $revision = $db->tableName( 'revision' );
+
+ $sql = "SELECT rev_id,rev_user," .
+ "rev_comment,rev_user_text,rev_timestamp,rev_minor_edit ".
+ "FROM $revision $use_index " .
+ "WHERE rev_page=$id " .
+ "ORDER BY rev_timestamp DESC ".$db->limitResult($limitplus,$offset);
$res = $db->query( $sql, $fname );
$revs = $db->numRows( $res );
}
$s .= $this->beginHistoryList();
$counter = 1;
- if( $offset == 0 ){
- $this->linesonpage++;
- $s .= $this->historyLine(
- $this->mArticle->getTimestamp(),
- $this->mArticle->getUser(),
- $this->mArticle->getUserText(), $namespace,
- $title, 0, $this->mArticle->getComment(),
- ( $this->mArticle->getMinorEdit() > 0 ),
- $counter++
- );
- }
while ( $line = $db->fetchObject( $res ) ) {
$s .= $this->historyLine(
- $line->old_timestamp, $line->old_user,
- $line->old_user_text, $namespace,
- $title, $line->old_id,
- $line->old_comment, ( $line->old_minor_edit > 0 ),
- $counter++
+ $line->rev_timestamp, $line->rev_user,
+ $line->rev_user_text, $namespace,
+ $title, $line->rev_id,
+ $line->rev_comment, ( $line->rev_minor_edit > 0 ),
+ $counter,
+ $notificationtimestamp,
+ ($counter == 1 && $offset == 0)
);
+ $counter++;
}
$s .= $this->endHistoryList( !$atend );
$s .= $numbar;
$s = '<p>' . wfMsg( 'histlegend' ) . '</p>';
$s .= '<form action="' . $wgTitle->escapeLocalURL( '-' ) . '" method="get">';
$prefixedkey = htmlspecialchars($wgTitle->getPrefixedDbKey());
- $s .= "<input type='hidden' name='title' value='{$prefixedkey}' />\n";
+ $s .= "<input type='hidden' name='title' value=\"{$prefixedkey}\" />\n";
$s .= !empty($this->submitbuttonhtml1) ? $this->submitbuttonhtml1."\n":'';
$s .= '<ul id="pagehistory">';
return $s;
return $s;
}
- function historyLine( $ts, $u, $ut, $ns, $ttl, $oid, $c, $isminor, $counter = '' ) {
+ function historyLine( $ts, $u, $ut, $ns, $ttl, $oid, $c, $isminor, $counter = '', $notificationtimestamp = false, $latest = false ) {
global $wgLang, $wgContLang;
- $artname = Title::makeName( $ns, $ttl );
- $last = wfMsg( 'last' );
- $cur = wfMsg( 'cur' );
- $cr = wfMsg( 'currentrev' );
-
+ static $message;
+ if( !isset( $message ) ) {
+ foreach( explode( ' ', 'cur last selectolderversionfordiff selectnewerversionfordiff minoreditletter' ) as $msg ) {
+ $message[$msg] = wfMsg( $msg );
+ }
+ }
+
if ( $oid && $this->lastline ) {
- $ret = preg_replace( "/!OLDID!([0-9]+)!/", $this->mSkin->makeKnownLink(
- $artname, $last, "diff=\\1&oldid={$oid}",'' ,'' ,' tabindex="'.$counter.'"' ), $this->lastline );
+ $ret = preg_replace( "/!OLDID!([0-9]+)!/", $this->mSkin->makeKnownLinkObj(
+ $this->mTitle, $message['last'], "diff=\\1&oldid={$oid}",'' ,'' ,' tabindex="'.$counter.'"' ), $this->lastline );
} else {
$ret = '';
}
} else {
$q = '';
}
- $link = $this->mSkin->makeKnownLink( $artname, $dt, $q );
+ $link = $this->mSkin->makeKnownLinkObj( $this->mTitle, $dt, $q );
if ( 0 == $u ) {
- $ul = $this->mSkin->makeKnownLink( $wgContLang->specialPage( 'Contributions' ),
+ $contribsPage =& Title::makeTitle( NS_SPECIAL, 'Contributions' );
+ $ul = $this->mSkin->makeKnownLinkObj( $contribsPage,
htmlspecialchars( $ut ), 'target=' . urlencode( $ut ) );
} else {
- $ul = $this->mSkin->makeLink( $wgContLang->getNsText(
- Namespace::getUser() ) . ':'.$ut , htmlspecialchars( $ut ) );
+ $userPage =& Title::makeTitle( NS_USER, $ut );
+ $ul = $this->mSkin->makeLinkObj( $userPage , htmlspecialchars( $ut ) );
}
$s = '<li>';
- if ( $oid ) {
- $curlink = $this->mSkin->makeKnownLink( $artname, $cur,
+ if ( $oid && !$latest ) {
+ $curlink = $this->mSkin->makeKnownLinkObj( $this->mTitle, $message['cur'],
'diff=0&oldid='.$oid );
} else {
- $curlink = $cur;
+ $curlink = $message['cur'];
}
$arbitrary = '';
if( $this->linesonpage > 1) {
# XXX: move title texts to javascript
$checkmark = '';
- if ( !$oid ) {
- $arbitrary = '<input type="radio" style="visibility:hidden" name="oldid" value="'.$oid.'" title="'.wfMsg('selectolderversionfordiff').'" />';
+ if ( !$oid || $latest ) {
+ $arbitrary = '<input type="radio" style="visibility:hidden" name="oldid" value="'.$oid.'" title="'.$message['selectolderversionfordiff'].'" />';
$checkmark = ' checked="checked"';
} else {
if( $counter == 2 ) $checkmark = ' checked="checked"';
- $arbitrary = '<input type="radio" name="oldid" value="'.$oid.'" title="'.wfMsg('selectolderversionfordiff').'"'.$checkmark.' />';
+ $arbitrary = '<input type="radio" name="oldid" value="'.$oid.'" title="'.$message['selectolderversionfordiff'].'"'.$checkmark.' />';
$checkmark = '';
}
- $arbitrary .= '<input type="radio" name="diff" value="'.$oid.'" title="'.wfMsg('selectnewerversionfordiff').'"'.$checkmark.' />';
+ $arbitrary .= '<input type="radio" name="diff" value="'.$oid.'" title="'.$message['selectnewerversionfordiff'].'"'.$checkmark.' />';
}
$s .= "({$curlink}) (!OLDID!{$oid}!) $arbitrary {$link} <span class='user'>{$ul}</span>";
- $s .= $isminor ? ' <span class="minor">'.wfMsg( "minoreditletter" ).'</span>': '' ;
+ $s .= $isminor ? ' <span class="minor">'.$message['minoreditletter'].'</span>': '' ;
- if ( '' != $c && '*' != $c ) {
- $c = $this->mSkin->formatcomment($c,$this->mTitle);
- $s .= " <em>($c)</em>";
+ $s .= $this->mSkin->commentBlock( $c, $this->mTitle );
+ if ($notificationtimestamp && ($ts >= $notificationtimestamp)) {
+ $s .= wfMsg( 'updatedmarker' );
}
$s .= '</li>';
dépôts / lhc / web / wiklou.git / blobdiff