/**@{{
* @private
*/
- protected $mContext; // !< RequestContext
+
+ /**
+ * @var RequestContext
+ */
+ protected $mContext;
var $mContent; // !<
var $mContentLoaded = false; // !<
var $mCounter = -1; // !< Not loaded
var $mDataLoaded = false; // !<
- var $mForUpdate = false; // !<
var $mGoodAdjustment = 0; // !<
var $mIsRedirect = false; // !<
var $mLatest = false; // !<
var $mOldId; // !<
- var $mPreparedEdit = false; // !< Title object if set
- var $mRedirectedFrom = null; // !< Title object if set
- var $mRedirectTarget = null; // !< Title object if set
+ var $mPreparedEdit = false;
+
+ /**
+ * @var Title
+ */
+ var $mRedirectedFrom = null;
+
+ /**
+ * @var Title
+ */
+ var $mRedirectTarget = null;
+
+ /**
+ * @var Title
+ */
var $mRedirectUrl = false; // !<
var $mRevIdFetched = 0; // !<
- var $mLastRevision = null; // !< Latest revision if set
- var $mRevision = null; // !< Loaded revision object if set
+
+ /**
+ * @var Revision
+ */
+ var $mLastRevision = null;
+
+ /**
+ * @var Revision
+ */
+ var $mRevision = null;
+
var $mTimestamp = ''; // !<
var $mTitle; // !< Title object
var $mTotalAdjustment = 0; // !<
var $mTouched = '19700101000000'; // !<
- var $mParserOptions; // !< ParserOptions object
- var $mParserOutput; // !< ParserCache object if set
+
+ /**
+ * @var ParserOptions
+ */
+ var $mParserOptions;
+
+ /**
+ * @var ParserOutput
+ */
+ var $mParserOutput;
+
/**@}}*/
/**
$this->mTimestamp = '';
$this->mGoodAdjustment = $this->mTotalAdjustment = 0;
$this->mTouched = '19700101000000';
- $this->mForUpdate = false;
$this->mIsRedirect = false;
$this->mRevIdFetched = 0;
$this->mRedirectUrl = false;
return $text;
}
- /**
- * This function returns the text of a section, specified by a number ($section).
- * A section is text under a heading like == Heading == or \<h1\>Heading\</h1\>, or
- * the first section before any such heading (section 0).
- *
- * If a section contains subsections, these are also returned.
- *
- * @param $text String: text to look in
- * @param $section Integer: section number
- * @return string text of the requested section
- * @deprecated
- */
- public function getSection( $text, $section ) {
- global $wgParser;
- return $wgParser->getSection( $text, $section );
- }
-
/**
* Get the text that needs to be saved in order to undo all revisions
* between $undo and $undoafter. Revisions must belong to the same page,
/**
* Fetch a page record with the given conditions
- * @param $dbr Database object
+ * @param $dbr DatabaseBase object
* @param $conditions Array
* @return mixed Database result resource, or false on failure
*/
* Fetch a page record matching the Title object's namespace and title
* using a sanitized title string
*
- * @param $dbr Database object
+ * @param $dbr DatabaseBase object
* @param $title Title object
* @return mixed Database result resource, or false on failure
*/
/**
* Fetch a page record matching the requested ID
*
- * @param $dbr Database
+ * @param $dbr DatabaseBase
* @param $id Integer
* @return mixed Database result resource, or false on failure
*/
* Set the general counter, title etc data loaded from
* some source.
*
- * @param $data Database row object or "fromdb"
+ * @param $data Object|String $res->fetchObject() object or the string "fromdb" to reload
*/
public function loadPageData( $data = 'fromdb' ) {
if ( $data === 'fromdb' ) {
}
/**
- * Read/write accessor to select FOR UPDATE
- * @FIXME: remove, does nothing
- *
- * @param $x Mixed: FIXME
- * @return mixed value of $x, or value stored in Article::mForUpdate
+ * No-op
+ * @deprecated since 1.18
*/
- public function forUpdate( $x = null ) {
+ public function forUpdate() {
wfDeprecated( __METHOD__ );
- return wfSetVar( $this->mForUpdate, $x );
}
/**
$dbr = wfGetDB( DB_SLAVE );
$userTable = $dbr->tableName( 'user' );
+ if ( $dbr->implicitGroupby() ) {
+ $realNameField = 'user_real_name';
+ } else {
+ $realNameField = 'FIRST(user_real_name) AS user_real_name';
+ }
+
$tables = array( 'revision', 'user' );
$fields = array(
- "$userTable.*",
+ 'rev_user as user_id',
'rev_user_text AS user_name',
+ $realNameField,
'MAX(rev_timestamp) AS timestamp',
);
* @return boolean
*/
public function showRedirectedFromHeader() {
- global $wgOut, $wgUser, $wgRequest, $wgRedirectSources;
+ global $wgOut, $wgRequest, $wgRedirectSources;
$rdfrom = $wgRequest->getVal( 'rdfrom' );
// This is an internally redirected page view.
// We'll need a backlink to the source page for navigation.
if ( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) {
- $redir = $wgUser->getSkin()->link(
+ $redir = Linker::link(
$this->mRedirectedFrom,
null,
array(),
// This is an externally redirected view, from some other wiki.
// If it was reported from a trusted site, supply a backlink.
if ( $wgRedirectSources && preg_match( $wgRedirectSources, $rdfrom ) ) {
- $redir = $wgUser->getSkin()->makeExternalLink( $rdfrom, $rdfrom );
+ $redir = Linker::makeExternalLink( $rdfrom, $rdfrom );
$s = wfMsgExt( 'redirectedfrom', array( 'parseinline', 'replaceafter' ), $redir );
$wgOut->setSubtitle( $s );
return;
}
- $sk = $wgUser->getSkin();
$token = $wgUser->editToken( $rcid );
$wgOut->preventClickjacking();
"<div class='patrollink'>" .
wfMsgHtml(
'markaspatrolledlink',
- $sk->link(
+ Linker::link(
$this->mTitle,
wfMsgHtml( 'markaspatrolledtext' ),
array(),
* @return string containing HMTL with redirect link
*/
public function viewRedirect( $target, $appendSubtitle = true, $forceKnown = false ) {
- global $wgOut, $wgContLang, $wgStylePath, $wgUser;
+ global $wgOut, $wgContLang, $wgStylePath;
if ( !is_array( $target ) ) {
$target = array( $target );
$wgOut->appendSubtitle( wfMsgHtml( 'redirectpagesub' ) );
}
- $sk = $wgUser->getSkin();
// the loop prepends the arrow image before the link, so the first case needs to be outside
$title = array_shift( $target );
if ( $forceKnown ) {
- $link = $sk->linkKnown( $title, htmlspecialchars( $title->getFullText() ) );
+ $link = Linker::linkKnown( $title, htmlspecialchars( $title->getFullText() ) );
} else {
- $link = $sk->link( $title, htmlspecialchars( $title->getFullText() ) );
+ $link = Linker::link( $title, htmlspecialchars( $title->getFullText() ) );
}
$nextRedirect = $wgStylePath . '/common/images/nextredirect' . $imageDir . '.png';
foreach ( $target as $rt ) {
$link .= Html::element( 'img', array( 'src' => $nextRedirect, 'alt' => $alt ) );
if ( $forceKnown ) {
- $link .= $sk->linkKnown( $rt, htmlspecialchars( $rt->getFullText(), array(), array( 'redirect' => 'no' ) ) );
+ $link .= Linker::linkKnown( $rt, htmlspecialchars( $rt->getFullText(), array(), array( 'redirect' => 'no' ) ) );
} else {
- $link .= $sk->link( $rt, htmlspecialchars( $rt->getFullText() ), array(), array( 'redirect' => 'no' ) );
+ $link .= Linker::link( $rt, htmlspecialchars( $rt->getFullText() ), array(), array( 'redirect' => 'no' ) );
}
}
* or else the record will be left in a funky state.
* Best if all done inside a transaction.
*
- * @param $dbw Database
+ * @param $dbw DatabaseBase
* @return int The newly created page_id key, or false if the title already existed
* @private
*/
/**
* Add row to the redirect table if this is a redirect, remove otherwise.
*
- * @param $dbw Database
+ * @param $dbw DatabaseBase
* @param $redirectTitle Title object pointing to the redirect target,
* or NULL if this is not a redirect
* @param $lastRevIsRedirect If given, will optimize adding and
if ( in_array( array( 'markedaspatrollederror-noautopatrol' ), $errors ) ) {
$wgOut->setPageTitle( wfMsg( 'markedaspatrollederror' ) );
$wgOut->addWikiMsg( 'markedaspatrollederror-noautopatrol' );
- $wgOut->returnToMain( false, $return );
+ $wgOut->returnToMain( null, $return );
return;
}
# Inform the user
$wgOut->setPageTitle( wfMsg( 'markedaspatrolled' ) );
$wgOut->addWikiMsg( 'markedaspatrolledtext', $rc->getTitle()->getPrefixedText() );
- $wgOut->returnToMain( false, $return );
+ $wgOut->returnToMain( null, $return );
}
/**
if ( $hasHistory && !$confirm ) {
global $wgLang;
- $skin = $wgOut->getSkin();
$revisions = $this->estimateRevisionCount();
//FIXME: lego
$wgOut->addHTML( '<strong class="mw-delete-warning-revisions">' .
wfMsgExt( 'historywarning', array( 'parseinline' ), $wgLang->formatNum( $revisions ) ) .
- wfMsgHtml( 'word-separator' ) . $skin->link( $this->mTitle,
+ wfMsgHtml( 'word-separator' ) . Linker::link( $this->mTitle,
wfMsgHtml( 'history' ),
array( 'rel' => 'archives' ),
array( 'action' => 'history' ) ) .
wfDebug( "Article::confirmDelete\n" );
- $deleteBackLink = $wgOut->getSkin()->linkKnown( $this->mTitle );
+ $deleteBackLink = Linker::linkKnown( $this->mTitle );
$wgOut->setSubtitle( wfMsgHtml( 'delete-backlink', $deleteBackLink ) );
$wgOut->setRobotPolicy( 'noindex,nofollow' );
$wgOut->addWikiMsg( 'confirmdeletetext' );
Xml::closeElement( 'form' );
if ( $wgOut->getUser()->isAllowed( 'editinterface' ) ) {
- $skin = $wgOut->getSkin();
$title = Title::makeTitle( NS_MEDIAWIKI, 'Deletereason-dropdown' );
- $link = $skin->link(
+ $link = Linker::link(
$title,
wfMsgHtml( 'delete-edit-reasonlist' ),
array(),
$dbw->delete( 'templatelinks', array( 'tl_from' => $id ) );
$dbw->delete( 'externallinks', array( 'el_from' => $id ) );
$dbw->delete( 'langlinks', array( 'll_from' => $id ) );
+ $dbw->delete( 'iwlinks', array( 'iwl_from' => $id ) );
$dbw->delete( 'redirect', array( 'rd_from' => $id ) );
}
if ( $current->getComment() != '' ) {
$wgOut->addWikiMsgArray( 'editcomment', array(
- $wgUser->getSkin()->formatComment( $current->getComment() ) ), array( 'replaceafter' ) );
+ Linker::formatComment( $current->getComment() ) ), array( 'replaceafter' ) );
}
}
if ( $current->getUserText() === '' ) {
$old = wfMsg( 'rev-deleted-user' );
} else {
- $old = $wgUser->getSkin()->userLink( $current->getUser(), $current->getUserText() )
- . $wgUser->getSkin()->userToolLinks( $current->getUser(), $current->getUserText() );
+ $old = Linker::userLink( $current->getUser(), $current->getUserText() )
+ . Linker::userToolLinks( $current->getUser(), $current->getUserText() );
}
- $new = $wgUser->getSkin()->userLink( $target->getUser(), $target->getUserText() )
- . $wgUser->getSkin()->userToolLinks( $target->getUser(), $target->getUserText() );
+ $new = Linker::userLink( $target->getUser(), $target->getUserText() )
+ . Linker::userToolLinks( $target->getUser(), $target->getUserText() );
$wgOut->addHTML( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) );
$wgOut->returnToMain( false, $this->mTitle );
}
$revision = Revision::newFromId( $oldid );
+ $timestamp = $revision->getTimestamp();
$current = ( $oldid == $this->mLatest );
- $td = $wgLang->timeanddate( $this->mTimestamp, true );
- $tddate = $wgLang->date( $this->mTimestamp, true );
- $tdtime = $wgLang->time( $this->mTimestamp, true );
- $sk = $wgUser->getSkin();
+ $td = $wgLang->timeanddate( $timestamp, true );
+ $tddate = $wgLang->date( $timestamp, true );
+ $tdtime = $wgLang->time( $timestamp, true );
+
$lnk = $current
? wfMsgHtml( 'currentrevisionlink' )
- : $sk->link(
+ : Linker::link(
$this->mTitle,
wfMsgHtml( 'currentrevisionlink' ),
array(),
);
$curdiff = $current
? wfMsgHtml( 'diff' )
- : $sk->link(
+ : Linker::link(
$this->mTitle,
wfMsgHtml( 'diff' ),
array(),
);
$prev = $this->mTitle->getPreviousRevisionID( $oldid ) ;
$prevlink = $prev
- ? $sk->link(
+ ? Linker::link(
$this->mTitle,
wfMsgHtml( 'previousrevision' ),
array(),
)
: wfMsgHtml( 'previousrevision' );
$prevdiff = $prev
- ? $sk->link(
+ ? Linker::link(
$this->mTitle,
wfMsgHtml( 'diff' ),
array(),
: wfMsgHtml( 'diff' );
$nextlink = $current
? wfMsgHtml( 'nextrevision' )
- : $sk->link(
+ : Linker::link(
$this->mTitle,
wfMsgHtml( 'nextrevision' ),
array(),
);
$nextdiff = $current
? wfMsgHtml( 'diff' )
- : $sk->link(
+ : Linker::link(
$this->mTitle,
wfMsgHtml( 'diff' ),
array(),
$canHide = $wgUser->isAllowed( 'deleterevision' );
if ( $canHide || ( $revision->getVisibility() && $wgUser->isAllowed( 'deletedhistory' ) ) ) {
if ( !$revision->userCan( Revision::DELETED_RESTRICTED ) ) {
- $cdel = $sk->revDeleteLinkDisabled( $canHide ); // rev was hidden from Sysops
+ $cdel = Linker::revDeleteLinkDisabled( $canHide ); // rev was hidden from Sysops
} else {
$query = array(
'type' => 'revision',
'target' => $this->mTitle->getPrefixedDbkey(),
'ids' => $oldid
);
- $cdel = $sk->revDeleteLink( $query, $revision->isDeleted( File::DELETED_RESTRICTED ), $canHide );
+ $cdel = Linker::revDeleteLink( $query, $revision->isDeleted( File::DELETED_RESTRICTED ), $canHide );
}
$cdel .= ' ';
}
# Show user links if allowed to see them. If hidden, then show them only if requested...
- $userlinks = $sk->revUserTools( $revision, !$unhide );
+ $userlinks = Linker::revUserTools( $revision, !$unhide );
$infomsg = $current && !wfMessage( 'revision-info-current' )->isDisabled()
? 'revision-info-current'
/**
* Clears caches when article is deleted
+ *
+ * @param $title Title
*/
public static function onArticleDelete( $title ) {
# Update existence markers on article/talk tabs...
$msg = $wgUser->isLoggedIn()
? 'noarticletext'
: 'noarticletextanon';
- $wgOut->addHTML( wfMsgExt( $msg, 'parse' ) );
+ $wgOut->addWikiMsg( $msg );
}
$wgOut->addHTML( '</div>' );
/**
* Updates cascading protections
*
- * @param $parserOutput mixed ParserOptions object, or boolean false
+ * @param $parserOutput ParserOutput object, or boolean false
**/
protected function doCascadeProtectionUpdates( $parserOutput ) {
if ( !$this->isCurrent() || wfReadOnly() || !$this->mTitle->areRestrictionsCascading() ) {
}
class PoolWorkArticleView extends PoolCounterWork {
+
+ /**
+ * @var Article
+ */
private $mArticle;
function __construct( $article, $key, $useParserCache, $parserOptions ) {
return $this->mArticle->tryDirtyCache();
}
+ /**
+ * @param $status Status
+ */
function error( $status ) {
global $wgOut;
dépôts / lhc / web / wiklou.git / blobdiff