function preCacheMessages() {
// Precache various messages
if( !isset( $this->message ) ) {
- $this->message['last'] = wfMsgExt( 'last', array( 'escape' ) );
+ $this->message['last'] = $this->msg( 'last' )->escaped();
}
}
public function execute( $par ) {
- $user = $this->getUser();
- if( !$this->userCanExecute( $user ) ) {
- $this->displayRestrictionError();
- return;
- }
-
- if ( wfReadOnly() ) {
- throw new ReadOnlyError;
- }
+ $this->checkPermissions();
+ $this->checkReadOnly();
$this->loadRequestParams();
$this->outputHeader();
if( $this->mTargetID && $this->mDestID && $this->mAction == 'submit' && $this->mMerge ) {
- return $this->merge();
+ $this->merge();
+ return;
}
if ( !$this->mSubmitted ) {
$errors = array();
if ( !$this->mTargetObj instanceof Title ) {
- $errors[] = wfMsgExt( 'mergehistory-invalid-source', array( 'parse' ) );
+ $errors[] = $this->msg( 'mergehistory-invalid-source' )->parseAsBlock();
} elseif( !$this->mTargetObj->exists() ) {
- $errors[] = wfMsgExt( 'mergehistory-no-source', array( 'parse' ),
+ $errors[] = $this->msg( 'mergehistory-no-source', array( 'parse' ),
wfEscapeWikiText( $this->mTargetObj->getPrefixedText() )
- );
+ )->parseAsBlock();
}
if ( !$this->mDestObj instanceof Title ) {
- $errors[] = wfMsgExt( 'mergehistory-invalid-destination', array( 'parse' ) );
+ $errors[] = $this->msg( 'mergehistory-invalid-destination' )->parseAsBlock();
} elseif( !$this->mDestObj->exists() ) {
- $errors[] = wfMsgExt( 'mergehistory-no-destination', array( 'parse' ),
+ $errors[] = $this->msg( 'mergehistory-no-destination', array( 'parse' ),
wfEscapeWikiText( $this->mDestObj->getPrefixedText() )
- );
+ )->parseAsBlock();
}
if ( $this->mTargetObj && $this->mDestObj && $this->mTargetObj->equals( $this->mDestObj ) ) {
- $errors[] = wfMsgExt( 'mergehistory-same-destination', array( 'parse' ) );
+ $errors[] = $this->msg( 'mergehistory-same-destination' )->parseAsBlock();
}
if ( count( $errors ) ) {
'action' => $wgScript ) ) .
'<fieldset>' .
Xml::element( 'legend', array(),
- wfMsg( 'mergehistory-box' ) ) .
+ $this->msg( 'mergehistory-box' )->text() ) .
Html::hidden( 'title', $this->getTitle()->getPrefixedDbKey() ) .
Html::hidden( 'submitted', '1' ) .
Html::hidden( 'mergepoint', $this->mTimestamp ) .
Xml::openElement( 'table' ) .
'<tr>
- <td>' . Xml::label( wfMsg( 'mergehistory-from' ), 'target' ) . '</td>
+ <td>' . Xml::label( $this->msg( 'mergehistory-from' )->text(), 'target' ) . '</td>
<td>' . Xml::input( 'target', 30, $this->mTarget, array( 'id' => 'target' ) ) . '</td>
</tr><tr>
- <td>' . Xml::label( wfMsg( 'mergehistory-into' ), 'dest' ) . '</td>
+ <td>' . Xml::label( $this->msg( 'mergehistory-into' )->text(), 'dest' ) . '</td>
<td>' . Xml::input( 'dest', 30, $this->mDest, array( 'id' => 'dest' ) ) . '</td>
</tr><tr><td>' .
- Xml::submitButton( wfMsg( 'mergehistory-go' ) ) .
+ Xml::submitButton( $this->msg( 'mergehistory-go' )->text() ) .
'</td></tr>' .
Xml::closeElement( 'table' ) .
'</fieldset>' .
}
private function showHistory() {
- $out = $this->getOutput();
- $out->setPageTitle( wfMsg( 'mergehistory' ) );
-
$this->showMergeForm();
# List all stored revisions
);
$haveRevisions = $revisions && $revisions->getNumRows() > 0;
+ $out = $this->getOutput();
$titleObj = $this->getTitle();
$action = $titleObj->getLocalURL( array( 'action' => 'submit' ) );
# Start the form here
# in a nice little table
$table =
Xml::openElement( 'fieldset' ) .
- wfMsgExt( 'mergehistory-merge', array( 'parseinline' ),
- $this->mTargetObj->getPrefixedText(), $this->mDestObj->getPrefixedText() ) .
+ $this->msg( 'mergehistory-merge', $this->mTargetObj->getPrefixedText(),
+ $this->mDestObj->getPrefixedText() )->parse() .
Xml::openElement( 'table', array( 'id' => 'mw-mergehistory-table' ) ) .
'<tr>
<td class="mw-label">' .
- Xml::label( wfMsg( 'mergehistory-reason' ), 'wpComment' ) .
+ Xml::label( $this->msg( 'mergehistory-reason' )->text(), 'wpComment' ) .
'</td>
<td class="mw-input">' .
Xml::input( 'wpComment', 50, $this->mComment, array( 'id' => 'wpComment' ) ) .
<tr>
<td> </td>
<td class="mw-submit">' .
- Xml::submitButton( wfMsg( 'mergehistory-submit' ), array( 'name' => 'merge', 'id' => 'mw-merge-submit' ) ) .
+ Xml::submitButton( $this->msg( 'mergehistory-submit' )->text(), array( 'name' => 'merge', 'id' => 'mw-merge-submit' ) ) .
'</td>
</tr>' .
Xml::closeElement( 'table' ) .
$out->addHTML(
'<h2 id="mw-mergehistory">' .
- wfMsgHtml( 'mergehistory-list' ) . "</h2>\n"
+ $this->msg( 'mergehistory-list' )->escaped() . "</h2>\n"
);
if( $haveRevisions ) {
$misc .= Html::hidden( 'destID', $this->mDestObj->getArticleID() );
$misc .= Html::hidden( 'target', $this->mTarget );
$misc .= Html::hidden( 'dest', $this->mDest );
- $misc .= Html::hidden( 'wpEditToken', $this->getUser()->editToken() );
+ $misc .= Html::hidden( 'wpEditToken', $this->getUser()->getEditToken() );
$misc .= Xml::closeElement( 'form' );
$out->addHTML( $misc );
$pageLink = Linker::linkKnown(
$rev->getTitle(),
- htmlspecialchars( $this->getLang()->timeanddate( $ts ) ),
+ htmlspecialchars( $this->getLanguage()->timeanddate( $ts ) ),
array(),
array( 'oldid' => $rev->getId() )
);
}
# Last link
- if( !$rev->userCan( Revision::DELETED_TEXT ) ) {
+ if( !$rev->userCan( Revision::DELETED_TEXT, $this->getUser() ) ) {
$last = $this->message['last'];
} elseif( isset( $this->prevId[$row->rev_id] ) ) {
$last = Linker::linkKnown(
}
$comment = Linker::revComment( $rev );
- return "<li>$checkBox ($last) $pageLink . . $userLink $stxt $comment</li>";
- }
+ $revisionRow = $this->msg( 'mergehistory-revisionrow' )->rawParams( $checkBox, $last, $pageLink, $userLink, $stxt, $comment)->escaped();
+ $revisionRow .= "<li>" . $line . "</li>";
- /**
- * Fetch revision text link if it's available to all users
- * @return string
- */
- function getPageLink( $row, $titleObj, $ts, $target ) {
- if( !$this->userCan( $row, Revision::DELETED_TEXT ) ) {
- return '<span class="history-deleted">' .
- $this->getLang()->timeanddate( $ts, true ) . '</span>';
- } else {
- $link = Linker::linkKnown(
- $titleObj,
- $this->getLang()->timeanddate( $ts, true ),
- array(),
- array(
- 'target' => $target,
- 'timestamp' => $ts
- )
- );
- if( $this->isDeleted( $row, Revision::DELETED_TEXT ) ) {
- $link = '<span class="history-deleted">' . $link . '</span>';
- }
- return $link;
- }
+ return $revisionRow;
}
function merge() {
if( is_null( $targetTitle ) || is_null( $destTitle ) ) {
return false; // validate these
}
- if( $targetTitle->getArticleId() == $destTitle->getArticleId() ) {
+ if( $targetTitle->getArticleID() == $destTitle->getArticleID() ) {
return false;
}
# Verify that this timestamp is valid
);
if( !$haveRevisions ) {
if( $this->mComment ) {
- $comment = wfMsgForContent(
+ $comment = $this->msg(
'mergehistory-comment',
$targetTitle->getPrefixedText(),
$destTitle->getPrefixedText(),
$this->mComment
- );
+ )->inContentLanguage()->text();
} else {
- $comment = wfMsgForContent(
+ $comment = $this->msg(
'mergehistory-autocomment',
$targetTitle->getPrefixedText(),
$destTitle->getPrefixedText()
- );
+ )->inContentLanguage()->text();
}
$mwRedir = MagicWord::get( 'redirect' );
$redirectText = $mwRedir->getSynonym( 0 ) . ' [[' . $destTitle->getPrefixedText() . "]]\n";
- $redirectArticle = new Article( $targetTitle );
+ $redirectPage = WikiPage::factory( $targetTitle );
$redirectRevision = new Revision( array(
'page' => $this->mTargetID,
'comment' => $comment,
'text' => $redirectText ) );
$redirectRevision->insertOn( $dbw );
- $redirectArticle->updateRevisionOn( $dbw, $redirectRevision );
+ $redirectPage->updateRevisionOn( $dbw, $redirectRevision );
# Now, we record the link from the redirect to the new title.
# It should have no other outgoing links...
array( $destTitle->getPrefixedText(), $timestampLimit )
);
- $this->getOutput()->addHTML(
- wfMsgExt( 'mergehistory-success', array('parseinline'),
- $targetTitle->getPrefixedText(), $destTitle->getPrefixedText(), $count ) );
+ $this->getOutput()->addWikiMsg( 'mergehistory-success',
+ $targetTitle->getPrefixedText(), $destTitle->getPrefixedText(), $count );
wfRunHooks( 'ArticleMergeComplete', array( $targetTitle, $destTitle ) );
# Give some pointers to make (last) links
$this->mForm->prevId = array();
foreach ( $this->mResult as $row ) {
- $batch->addObj( Title::makeTitleSafe( NS_USER, $row->rev_user_text ) );
- $batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->rev_user_text ) );
+ $batch->addObj( Title::makeTitleSafe( NS_USER, $row->user_name ) );
+ $batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->user_name ) );
$rev_id = isset( $rev_id ) ? $rev_id : $row->rev_id;
if( $rev_id > $row->rev_id ) {
function getQueryInfo() {
$conds = $this->mConds;
$conds['rev_page'] = $this->articleID;
- $conds[] = 'page_id = rev_page';
$conds[] = "rev_timestamp < {$this->maxTimestamp}";
return array(
- 'tables' => array( 'revision', 'page' ),
- 'fields' => array(
- 'rev_minor_edit', 'rev_timestamp', 'rev_user', 'rev_user_text',
- 'rev_comment', 'rev_id', 'rev_page', 'rev_parent_id',
- 'rev_text_id', 'rev_len', 'rev_deleted'
- ),
- 'conds' => $conds
+ 'tables' => array( 'revision', 'page', 'user' ),
+ 'fields' => array_merge( Revision::selectFields(), Revision::selectUserFields() ),
+ 'conds' => $conds,
+ 'join_conds' => array(
+ 'page' => Revision::pageJoinCond(),
+ 'user' => Revision::userJoinCond() )
);
}
dépôts / lhc / web / wiklou.git / blobdiff