$wgArticleOldContentFields = false;
/**
- * Class representing a Wikipedia article and history.
+ * Class representing a MediaWiki article and history.
*
- * See design.doc for an overview.
+ * See design.txt for an overview.
* Note: edit user interface and cache support functions have been
* moved to separate EditPage and CacheManager classes.
*
*/
var $mContent, $mContentLoaded;
var $mUser, $mTimestamp, $mUserText;
- var $mCounter, $mComment, $mCountAdjustment;
+ var $mCounter, $mComment, $mGoodAdjustment, $mTotalAdjustment;
var $mMinorEdit, $mRedirectedFrom;
var $mTouched, $mFileCache, $mTitle;
var $mId, $mTable;
var $mForUpdate;
var $mOldId;
var $mRevIdFetched;
+ var $mRevision;
/**#@-*/
/**
* @public
*/
function getTitle() {
- return $this->mTitle;
+ return $this->mTitle;
}
/**
function clear() {
$this->mDataLoaded = false;
$this->mContentLoaded = false;
-
+
$this->mCurID = $this->mUser = $this->mCounter = -1; # Not loaded
$this->mRedirectedFrom = $this->mUserText =
$this->mTimestamp = $this->mComment = $this->mFileCache = '';
- $this->mCountAdjustment = 0;
+ $this->mGoodAdjustment = $this->mTotalAdjustment = 0;
$this->mTouched = '19700101000000';
$this->mForUpdate = false;
$this->mIsRedirect = false;
* @return Return the text of this revision
*/
function getContent( $noredir ) {
- global $wgRequest;
+ global $wgRequest, $wgUser, $wgOut;
# Get variables from query string :P
$action = $wgRequest->getText( 'action', 'view' );
$section = $wgRequest->getText( 'section' );
+ $preload = $wgRequest->getText( 'preload' );
$fname = 'Article::getContent';
wfProfileIn( $fname );
if ( 0 == $this->getID() ) {
if ( 'edit' == $action ) {
wfProfileOut( $fname );
- return ''; # was "newarticletext", now moved above the box)
+ # Should we put something in the textarea?
+ # if &preload=Pagename is set, we try to get
+ # the revision text and put it in.
+ if($preload) {
+ $preloadTitle=Title::newFromText($preload);
+ if(isset($preloadTitle) && $preloadTitle->userCanRead()) {
+ $rev=Revision::newFromTitle($preloadTitle);
+ if($rev) {
+ return $rev->getText();
+ }
+ }
+ }
+ # Don't preload anything.
+ # We used to put MediaWiki:Newarticletext here.
+ # This is now shown above the edit box instead.
+ return '';
}
wfProfileOut( $fname );
+ $wgOut->setRobotpolicy( 'noindex,nofollow' );
return wfMsg( 'noarticletext' );
} else {
$this->loadContent( $noredir );
# check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page
if ( $this->mTitle->getNamespace() == NS_USER_TALK &&
- preg_match('/^\d{1,3}\.\d{1,3}.\d{1,3}\.\d{1,3}$/',$this->mTitle->getText()) &&
+ $wgUser->isIP($this->mTitle->getText()) &&
$action=='view'
) {
wfProfileOut( $fname );
function getOldID() {
global $wgRequest, $wgOut;
static $lastid;
-
+
if ( isset( $lastid ) ) {
return $lastid;
}
global $wgOut, $wgRequest;
if ( $this->mContentLoaded ) return;
-
+
# Query variables :P
$oldid = $this->getOldID();
$redirect = $wgRequest->getVal( 'redirect' );
$this->mOldId = $oldid;
$this->fetchContent( $oldid, $noredir, true );
}
-
-
+
+
/**
* Fetch a page record with the given conditions
* @param Database $dbr
$conditions,
'Article::pageData' );
}
-
+
function pageDataFromTitle( &$dbr, $title ) {
return $this->pageData( $dbr, array(
'page_namespace' => $title->getNamespace(),
'page_title' => $title->getDBkey() ) );
}
-
+
function pageDataFromId( &$dbr, $id ) {
return $this->pageData( $dbr, array(
'page_id' => IntVal( $id ) ) );
}
-
+
/**
* Set the general counter, title etc data loaded from
* some source.
* @access private
*/
function loadPageData( $data ) {
- $this->mTitle->mRestrictions = explode( ',', trim( $data->page_restrictions ) );
+ $this->mTitle->loadRestrictions( $data->page_restrictions );
$this->mTitle->mRestrictionsLoaded = true;
-
+
$this->mCounter = $data->page_counter;
$this->mTouched = wfTimestamp( TS_MW, $data->page_touched );
$this->mIsRedirect = $data->page_is_redirect;
$this->mLatest = $data->page_latest;
-
+
$this->mDataLoaded = true;
}
-
+
/**
* Get text of an article from database
* @param int $oldid 0 for whatever the latest revision is
- * @param bool $noredir Set to true to avoid following redirects
+ * @param bool $noredir Set to false to follow redirects
* @param bool $globalTitle Set to true to change the global $wgTitle object when following redirects or other unexpected title changes
* @return string
*/
- function fetchContent( $oldid = 0, $noredir = false, $globalTitle = false ) {
+ function fetchContent( $oldid = 0, $noredir = true, $globalTitle = false ) {
if ( $this->mContentLoaded ) {
return $this->mContent;
}
# Gotta hand redirects to special pages differently:
# Fill the HTTP response "Location" header and ignore
# the rest of the page we're on.
- if( $globalTitle ) {
+ global $wgDisableHardRedirects;
+ if( $globalTitle && !$wgDisableHardRedirects ) {
global $wgOut;
if ( $rt->getInterwiki() != '' && $rt->isLocal() ) {
$source = $this->mTitle->getFullURL( 'redirect=no' );
$wgTitle = $this->mTitle;
}
}
-
+
# Back to the business at hand...
$this->mContent = $revision->getText();
-
+
$this->mUser = $revision->getUser();
$this->mUserText = $revision->getUserText();
$this->mComment = $revision->getComment();
$this->mTimestamp = wfTimestamp( TS_MW, $revision->getTimestamp() );
-
+
$this->mRevIdFetched = $revision->getID();
$this->mContentLoaded = true;
-
+ $this->mRevision =& $revision;
+
return $this->mContent;
}
}
}
+ /**
+ * Returns true if this article exists in the database.
+ * @return bool
+ */
+ function exists() {
+ return $this->getId() != 0;
+ }
+
/**
* Get the view count for this article
*/
return 1;
}
- /**
+ /**
* Tests if the article text represents a redirect
*/
function isRedirect( $text = false ) {
if ( $text === false ) {
$this->loadContent();
- $titleObj = Title::newFromRedirect( $this->fetchRevisionText() );
+ $titleObj = Title::newFromRedirect( $this->fetchContent() );
} else {
$titleObj = Title::newFromRedirect( $text );
}
return $titleObj !== NULL;
}
+ /**
+ * Returns true if the currently-referenced revision is the current edit
+ * to this page (and it exists).
+ * @return bool
+ */
+ function isCurrent() {
+ return $this->exists() &&
+ isset( $this->mRevision ) &&
+ $this->mRevision->isCurrent();
+ }
+
/**
* Loads everything except the text
* This isn't necessary for all uses, so it's only done if needed.
*/
function loadLastEdit() {
global $wgOut;
-
+
if ( -1 != $this->mUser )
return;
$this->loadLastEdit();
return $this->mMinorEdit;
}
-
+
function getRevIdFetched() {
$this->loadLastEdit();
return $this->mRevIdFetched;
function view() {
global $wgUser, $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgLang;
global $wgLinkCache, $IP, $wgEnableParserCache, $wgStylePath, $wgUseRCPatrol;
- global $wgEnotif, $wgParser;
+ global $wgEnotif, $wgParser, $wgParserCache;
$sk = $wgUser->getSkin();
$fname = 'Article::view';
if ( !is_null( $diff ) ) {
require_once( 'DifferenceEngine.php' );
$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
-
+
$de = new DifferenceEngine( $oldid, $diff, $rcid );
// DifferenceEngine directly fetched the revision:
$this->mRevIdFetched = $de->mNewid;
wfProfileOut( $fname );
return;
}
+
if ( empty( $oldid ) && $this->checkTouched() ) {
+ $wgOut->setETag($wgParserCache->getETag($this, $wgUser));
+
if( $wgOut->checkLastModified( $this->mTouched ) ){
wfProfileOut( $fname );
return;
}
}
# Should the parser cache be used?
- if ( $wgEnableParserCache && intval($wgUser->getOption( 'stubthreshold' )) == 0 && empty( $oldid ) ) {
- $pcache = true;
- } else {
- $pcache = false;
- }
+ $pcache = $wgEnableParserCache &&
+ intval( $wgUser->getOption( 'stubthreshold' ) ) == 0 &&
+ $this->exists() &&
+ empty( $oldid );
+ wfDebug( 'Article::view using parser cache: ' . ($pcache ? 'yes' : 'no' ) . "\n" );
$outputDone = false;
if ( $pcache ) {
exit;
}
-
# We're looking at an old revision
if ( !empty( $oldid ) ) {
$wgOut->addHTML( '<img valign="center" src="'.$imageUrl.'" alt="#REDIRECT" />' .
'<span class="redirectText">'.$link.'</span>' );
-
+
$parseout = $wgParser->parse($text, $this->mTitle, ParserOptions::newFromUser($wgUser));
$catlinks = $parseout->getCategoryLinks();
$wgOut->addCategoryLinks($catlinks);
$wgOut->addPrimaryWikiText( $text, $this );
} else {
# Display content, don't attempt to save to parser cache
+
+ # Don't show section-edit links on old revisions... this way lies madness.
+ if( !$this->isCurrent() ) {
+ $oldEditSectionSetting = $wgOut->mParserOptions->setEditSection( false );
+ }
$wgOut->addWikiText( $text );
+
+ if( !$this->isCurrent() ) {
+ $wgOut->mParserOptions->setEditSection( $oldEditSectionSetting );
+ }
}
}
- $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+ /* title may have been set from the cache */
+ $t = $wgOut->getPageTitle();
+ if( empty( $t ) ) {
+ $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+ }
+
# If we have been passed an &rcid= parameter, we want to give the user a
# chance to mark this new article as patrolled.
- if ( $wgUseRCPatrol && !is_null ( $rcid ) && $rcid != 0 && $wgUser->isLoggedIn() &&
- ( $wgUser->isAllowed('patrol') || !$wgOnlySysopsCanPatrol ) )
+ if ( $wgUseRCPatrol
+ && !is_null($rcid)
+ && $rcid != 0
+ && $wgUser->isLoggedIn()
+ && ( $wgUser->isAllowed('patrol') || !$wgOnlySysopsCanPatrol ) )
{
- $wgOut->addHTML( wfMsg ( 'markaspatrolledlink',
- $sk->makeKnownLinkObj ( $this->mTitle, wfMsg ( 'markaspatrolledtext' ),
- 'action=markpatrolled&rcid='.$rcid )
- ) );
+ $wgOut->addHTML(
+ "<div class='patrollink'>" .
+ wfMsg ( 'markaspatrolledlink',
+ $sk->makeKnownLinkObj( $this->mTitle, wfMsg('markaspatrolledtext'), "action=markpatrolled&rcid=$rcid" )
+ ) .
+ '</div>'
+ );
}
# Put link titles into the link cache
wfProfileOut( $fname );
}
+ function render() {
+ global $wgOut;
+
+ $wgOut->setArticleBodyOnly(true);
+ $this->view();
+ }
+
/**
* Insert a new empty page record for this article.
* This *must* be followed up by creating a revision
function insertOn( &$dbw, $restrictions = '' ) {
$fname = 'Article::insertOn';
wfProfileIn( $fname );
-
+
$page_id = $dbw->nextSequenceValue( 'page_page_id_seq' );
$dbw->insert( 'page', array(
'page_id' => $page_id,
'page_latest' => 0, # Fill this in shortly...
), $fname );
$newid = $dbw->insertId();
-
+
$this->mTitle->resetArticleId( $newid );
-
+
wfProfileOut( $fname );
return $newid;
}
-
+
/**
* Update the page record to point to a newly saved revision.
*
function updateRevisionOn( &$dbw, $revision, $lastRevision = null ) {
$fname = 'Article::updateToRevision';
wfProfileIn( $fname );
-
+
$conditions = array( 'page_id' => $this->getId() );
if( !is_null( $lastRevision ) ) {
# An extra check against threads stepping on each other
array( /* SET */
'page_latest' => $revision->getId(),
'page_touched' => $dbw->timestamp(),
- 'page_is_new' => ($lastRevision === 0) ? 0 : 1,
+ 'page_is_new' => ($lastRevision === 0) ? 1 : 0,
'page_is_redirect' => Article::isRedirect( $text ),
'page_len' => strlen( $text ),
),
$conditions,
$fname );
-
+
wfProfileOut( $fname );
return ( $dbw->affectedRows() != 0 );
}
-
+
/**
* If the given revision is newer than the currently set page_latest,
* update the page record. Otherwise, do nothing.
function updateIfNewerOn( &$dbw, $revision ) {
$fname = 'Article::updateIfNewerOn';
wfProfileIn( $fname );
-
+
$row = $dbw->selectRow(
array( 'revision', 'page' ),
array( 'rev_id', 'rev_timestamp' ),
# No or missing previous revision; mark the page as new
$prev = 0;
}
-
+
$ret = $this->updateRevisionOn( $dbw, $revision, $prev );
wfProfileOut( $fname );
return $ret;
}
-
+
/**
* Theoretically we could defer these whole insert and update
* functions for after display, but that's taking a big leap
$fname = 'Article::insertNewArticle';
- $this->mCountAdjustment = $this->isCountable( $text );
+ $this->mGoodAdjustment = $this->isCountable( $text );
+ $this->mTotalAdjustment = 1;
$ns = $this->mTitle->getNamespace();
$ttl = $this->mTitle->getDBkey();
$text = $this->preSaveTransform( $text );
$isminor = ( $isminor && $wgUser->isLoggedIn() ) ? 1 : 0;
+ $now = wfTimestampNow();
$dbw =& wfGetDB( DB_MASTER );
# Add the page record; stake our claim on this title!
$newid = $this->insertOn( $dbw );
-
+
# Save the revision text...
$revision = new Revision( array(
'page' => $newid,
$revisionId = $revision->insertOn( $dbw );
$this->mTitle->resetArticleID( $newid );
-
+
# Update the page record with revision data
$this->updateRevisionOn( $dbw, $revision, 0 );
Article::onArticleCreate( $this->mTitle );
if(!$suppressRC) {
- RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary );
+ RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary, 'default',
+ '', strlen( $text ), $revisionId );
}
if ($watchthis) {
$this->showArticle( $text, wfMsg( 'newarticle' ), false, $isminor, $now, $summary, $oldid );
}
- /**
- * Fetch and uncompress the text for a given revision.
- * Can ask by rev_id number or timestamp (set $field)
- */
- function fetchRevisionText( $revId = null, $field = 'rev_id' ) {
- $fname = 'Article::fetchRevisionText';
- $dbw =& wfGetDB( DB_MASTER );
- if( $revId ) {
- $rev = $dbw->addQuotes( $revId );
- } else {
- $rev = 'page_latest';
- }
- $result = $dbw->query(
- sprintf( "SELECT old_text, old_flags
- FROM %s,%s,%s
- WHERE old_id=rev_id AND rev_page=page_id AND page_id=%d
- AND %s=%s",
- $dbw->tableName( 'page' ),
- $dbw->tableName( 'revision' ),
- $dbw->tableName( 'text' ),
- IntVal( $this->mTitle->getArticleId() ),
- $field,
- $rev ),
- $fname );
- $obj = $dbw->fetchObject( $result );
- $dbw->freeResult( $result );
- $oldtext = Revision::getRevisionText( $obj );
- return $oldtext;
- }
-
function getTextOfLastEditWithSectionReplacedOrAdded($section, $text, $summary = '', $edittime = NULL) {
$fname = 'Article::getTextOfLastEditWithSectionReplacedOrAdded';
- if( is_null( $edittime ) ) {
- $oldtext = $this->fetchRevisionText();
- } else {
- $oldtext = $this->fetchRevisionText( $edittime, 'rev_timestamp' );
- }
if ($section != '') {
+ if( is_null( $edittime ) ) {
+ $rev = Revision::newFromTitle( $this->mTitle );
+ } else {
+ $dbw =& wfGetDB( DB_MASTER );
+ $rev = Revision::loadFromTimestamp( $dbw, $this->mTitle, $edittime );
+ }
+ $oldtext = $rev->getText();
+
if($section=='new') {
if($summary) $subject="== {$summary} ==\n\n";
$text=$oldtext."\n\n".$subject.$text;
}
/**
- * Change an existing article. Puts the previous version back into the old table, updates RC
+ * Change an existing article. Puts the previous version back into the old table, updates RC
* and all necessary caches, mostly via the deferred update array.
*
- * It is possible to call this function from a command-line script, but note that you should
+ * It is possible to call this function from a command-line script, but note that you should
* first set $wgUser, and clean up $wgDeferredUpdates after each edit.
*/
function updateArticle( $text, $summary, $minor, $watchthis, $forceBot = false, $sectionanchor = '' ) {
$isminor = ( $minor && $wgUser->isLoggedIn() );
if ( $this->isRedirect( $text ) ) {
# Remove all content but redirect
- # This could be done by reconstructing the redirect from a title given by
+ # This could be done by reconstructing the redirect from a title given by
# Title::newFromRedirect(), but then we wouldn't know which synonym the user
# wants to see
if ( preg_match( "/^((" . $wgMwRedir->getBaseRegex() . ')[^\\n]+)/i', $text, $m ) ) {
$text = $this->preSaveTransform( $text );
$dbw =& wfGetDB( DB_MASTER );
+ $now = wfTimestampNow();
# Update article, but only if changed.
}
$oldtext = $this->getContent( true );
+ $oldsize = strlen( $oldtext );
+ $newsize = strlen( $text );
+ $lastRevision = 0;
if ( 0 != strcmp( $text, $oldtext ) ) {
- $this->mCountAdjustment = $this->isCountable( $text )
+ $this->mGoodAdjustment = $this->isCountable( $text )
- $this->isCountable( $oldtext );
+ $this->mTotalAdjustment = 0;
$now = wfTimestampNow();
$lastRevision = $dbw->selectField(
'page', 'page_latest', array( 'page_id' => $this->getId() ) );
-
+
$revision = new Revision( array(
'page' => $this->getId(),
'comment' => $summary,
'text' => $text
) );
$revisionId = $revision->insertOn( $dbw );
-
+
# Update page
$ok = $this->updateRevisionOn( $dbw, $revision, $lastRevision );
} else {
# Update recentchanges and purge cache and whatnot
$bot = (int)($wgUser->isBot() || $forceBot);
- RecentChange::notifyEdit( $now, $this->mTitle, $me2, $wgUser, $summary,
- $lastRevision, $this->getTimestamp(), $bot );
+ RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $wgUser, $summary,
+ $lastRevision, $this->getTimestamp(), $bot, '', $oldsize, $newsize,
+ $revisionId );
Article::onArticleEdit( $this->mTitle );
}
}
}
# standard deferred updates
$this->editUpdates( $text, $summary, $minor, $now );
-
-
+
+
$urls = array();
# Template namespace
# Purge all articles linking here
}
}
}
-
+
# Squid updates
if ( $wgUseSquid ) {
$urls = array_merge( $urls, $this->mTitle->getSquidURLs() );
$u = new SquidUpdate( $urls );
array_push( $wgPostCommitUpdateList, $u );
}
-
- $this->showArticle( $text, wfMsg( 'updated' ), $sectionanchor, $me2, $now, $summary, $lastRevision );
+
+ $this->showArticle( $text, wfMsg( 'updated' ), $sectionanchor, $isminor, $now, $summary, $lastRevision );
}
return $good;
}
* the link tables and redirect to the new page.
*/
function showArticle( $text, $subtitle , $sectionanchor = '', $me2, $now, $summary, $oldid ) {
- global $wgOut, $wgUser, $wgLinkCache, $wgEnotif;
+ global $wgUseDumbLinkUpdate, $wgAntiLockFlags, $wgOut, $wgUser, $wgLinkCache, $wgEnotif;
+ global $wgUseEnotif;
$wgLinkCache = new LinkCache();
- # Select for update
- $wgLinkCache->forUpdate( true );
- # Get old version of link table to allow incremental link updates
- $wgLinkCache->preFill( $this->mTitle );
- $wgLinkCache->clear();
+ if ( !$wgUseDumbLinkUpdate ) {
+ # Preload links to reduce lock time
+ if ( $wgAntiLockFlags & ALF_PRELOAD_LINKS ) {
+ $wgLinkCache->preFill( $this->mTitle );
+ $wgLinkCache->clear();
+ }
+ }
# Parse the text and replace links with placeholders
$wgOut = new OutputPage();
- $wgOut->addWikiText( $text );
- # Look up the links in the DB and add them to the link cache
- $wgOut->transformBuffer( RLH_FOR_UPDATE );
+ # Pass the current title along in case we're creating a wiki page
+ # which is different than the currently displayed one (e.g. image
+ # pages created on file uploads); otherwise, link updates will
+ # go wrong.
+ $wgOut->addWikiTextWithTitle( $text, $this->mTitle );
+
+ if ( !$wgUseDumbLinkUpdate ) {
+ # Move the current links back to the second register
+ $wgLinkCache->swapRegisters();
+
+ # Get old version of link table to allow incremental link updates
+ # Lock this data now since it is needed for an update
+ $wgLinkCache->forUpdate( true );
+ $wgLinkCache->preFill( $this->mTitle );
+
+ # Swap this old version back into its rightful place
+ $wgLinkCache->swapRegisters();
+ }
if( $this->isRedirect( $text ) )
$r = 'redirect=no';
$r = '';
$wgOut->redirect( $this->mTitle->getFullURL( $r ).$sectionanchor );
- # this call would better fit into RecentChange::notifyEdit and RecentChange::notifyNew .
- # this will be improved later (to-do)
-
- include_once( "UserMailer.php" );
- $wgEnotif = new EmailNotification ();
- $wgEnotif->NotifyOnPageChange( $wgUser->getID(), $this->mTitle->getDBkey(), $this->mTitle->getNamespace(),$now, $summary, $me2, $oldid );
+ if ( $wgUseEnotif ) {
+ # this would be better as an extension hook
+ include_once( "UserMailer.php" );
+ $wgEnotif = new EmailNotification ();
+ $wgEnotif->notifyOnPageChange( $this->mTitle, $now, $summary, $me2, $oldid );
+ }
}
/**
*/
function validate() {
global $wgOut, $wgUser, $wgRequest, $wgUseValidation;
-
+
if ( !$wgUseValidation ) # Are we using article validation at all?
{
$wgOut->errorpage( "nosuchspecialpage", "nospecialpagetext" );
return ;
}
-
+
$wgOut->setRobotpolicy( 'noindex,follow' );
$revision = $wgRequest->getVal( 'revision' );
-
+
include_once ( "SpecialValidate.php" ) ; # The "Validation" class
-
+
$v = new Validation ;
if ( $wgRequest->getVal ( "mode" , "" ) == "list" )
$t = $v->showList ( $this ) ;
+ else if ( $wgRequest->getVal ( "mode" , "" ) == "details" )
+ $t = $v->showDetails ( $this , $wgRequest->getVal( 'revision' ) ) ;
else
$t = $v->validatePageForm ( $this , $revision ) ;
-
+
$wgOut->addHTML ( $t ) ;
}
/**
* Add this page to $wgUser's watchlist
*/
-
+
function watch() {
-
+
global $wgUser, $wgOut;
if ( $wgUser->isAnon() ) {
}
if (wfRunHooks('WatchArticle', array(&$wgUser, &$this))) {
-
+
$wgUser->addWatch( $this->mTitle );
$wgUser->saveSettings();
$wgOut->setPagetitle( wfMsg( 'addedwatch' ) );
$wgOut->setRobotpolicy( 'noindex,follow' );
-
+
$link = $this->mTitle->getPrefixedText();
$text = wfMsg( 'addedwatchtext', $link );
$wgOut->addWikiText( $text );
}
-
+
$wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
}
/**
* Stop watching a page
*/
-
+
function unwatch() {
global $wgUser, $wgOut;
}
if (wfRunHooks('UnwatchArticle', array(&$wgUser, &$this))) {
-
+
$wgUser->removeWatch( $this->mTitle );
$wgUser->saveSettings();
-
+
wfRunHooks('UnwatchArticleComplete', array(&$wgUser, &$this));
-
+
$wgOut->setPagetitle( wfMsg( 'removedwatch' ) );
$wgOut->setRobotpolicy( 'noindex,follow' );
-
+
$link = $this->mTitle->getPrefixedText();
$text = wfMsg( 'removedwatchtext', $link );
$wgOut->addWikiText( $text );
}
-
+
$wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
}
$restrictions .= ":edit=" . $limit;
}
if (wfRunHooks('ArticleProtect', array(&$this, &$wgUser, $limit == 'sysop', $reason, $moveonly))) {
-
+
$dbw =& wfGetDB( DB_MASTER );
$dbw->update( 'page',
array( /* SET */
'page_id' => $id
), 'Article::protect'
);
-
+
wfRunHooks('ArticleProtectComplete', array(&$this, &$wgUser, $limit == 'sysop', $reason, $moveonly));
-
+
$log = new LogPage( 'protect' );
if ( $limit === '' ) {
$log->addEntry( 'unprotect', $this->mTitle, $reason );
wfDebug( "Article::confirmProtect\n" );
- $sub = htmlspecialchars( $this->mTitle->getPrefixedText() );
+ $sub = $this->mTitle->getPrefixedText();
$wgOut->setRobotpolicy( 'noindex,nofollow' );
$check = '';
# This code desperately needs to be totally rewritten
# Check permissions
- if ( ( ! $wgUser->isAllowed('delete') ) ) {
+ if( ( !$wgUser->isAllowed( 'delete' ) ) ) {
$wgOut->sysopRequired();
return;
}
- if ( wfReadOnly() ) {
+ if( wfReadOnly() ) {
$wgOut->readOnlyPage();
return;
}
# Better double-check that it hasn't been deleted yet!
$wgOut->setPagetitle( wfMsg( 'confirmdelete' ) );
- if ( ( '' == trim( $this->mTitle->getText() ) )
- or ( $this->mTitle->getArticleId() == 0 ) ) {
+ if( !$this->mTitle->exists() ) {
$wgOut->fatalError( wfMsg( 'cannotdelete' ) );
return;
}
- if ( $confirm ) {
+ if( $confirm ) {
$this->doDelete( $reason );
return;
}
$ns = $this->mTitle->getNamespace();
$title = $this->mTitle->getDBkey();
$revisions = $dbr->select( array( 'page', 'revision' ),
- array( 'rev_id' ),
+ array( 'rev_id', 'rev_user_text' ),
array(
'page_namespace' => $ns,
'page_title' => $title,
}
# Fetch cur_text
- $s = $dbr->selectRow( array( 'page', 'text' ),
- array( 'old_text' ),
- array(
- 'page_namespace' => $ns,
- 'page_title' => $title,
- 'page_latest = old_id'
- ), $fname, $this->getSelectOptions()
- );
+ $rev =& Revision::newFromTitle( $this->mTitle );
+
+ # Fetch name(s) of contributors
+ $rev_name = '';
+ $all_same_user = true;
+ while( $row = $dbr->fetchObject( $revisions ) ) {
+ if( $rev_name != '' && $rev_name != $row->rev_user_text ) {
+ $all_same_user = false;
+ } else {
+ $rev_name = $row->rev_user_text;
+ }
+ }
- if( $s !== false ) {
+ if( !is_null( $rev ) ) {
# if this is a mini-text, we can paste part of it into the deletion reason
+ $text = $rev->getText();
#if this is empty, an earlier revision may contain "useful" text
$blanked = false;
- if($s->old_text != '') {
- $text=$s->old_text;
- } else {
- if($old) { # TODO
- $text = Revision::getRevisionText( $old );
+ if( $text == '' ) {
+ $prev = $rev->getPrevious();
+ if( $prev ) {
+ $text = $prev->getText();
$blanked = true;
}
-
}
- $length=strlen($text);
+ $length = strlen( $text );
# this should not happen, since it is not possible to store an empty, new
# page. Let's insert a standard text in case it does, though
- if($length == 0 && $reason === '') {
- $reason = wfMsg('exblank');
+ if( $length == 0 && $reason === '' ) {
+ $reason = wfMsg( 'exblank' );
}
- if($length < 500 && $reason === '') {
-
+ if( $length < 500 && $reason === '' ) {
# comment field=255, let's grep the first 150 to have some user
# space left
- $text=substr($text,0,150);
- # let's strip out newlines and HTML tags
- $text=preg_replace('/\"/',"'",$text);
- $text=preg_replace('/\</','<',$text);
- $text=preg_replace('/\>/','>',$text);
- $text=preg_replace("/[\n\r]/",'',$text);
- if(!$blanked) {
- $reason=wfMsg('excontent'). " '".$text;
+ global $wgContLang;
+ $text = $wgContLang->truncate( $text, 150, '...' );
+
+ # let's strip out newlines
+ $text = preg_replace( "/[\n\r]/", '', $text );
+
+ if( !$blanked ) {
+ if( !$all_same_user ) {
+ $reason = wfMsg( 'excontent', $text );
+ } else {
+ $reason = wfMsg( 'excontentauthor', $text, $rev_name );
+ }
} else {
- $reason=wfMsg('exbeforeblank') . " '".$text;
+ $reason = wfMsg( 'exbeforeblank', $text );
}
- if($length>150) { $reason .= '...'; } # we've only pasted part of the text
- $reason.="'";
}
}
if (wfRunHooks('ArticleDelete', array(&$this, &$wgUser, &$reason))) {
if ( $this->doDeleteArticle( $reason ) ) {
$deleted = $this->mTitle->getPrefixedText();
-
+
$wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
-
- $sk = $wgUser->getSkin();
- $loglink = $sk->makeKnownLink( $wgContLang->getNsText( NS_PROJECT ) .
- ':' . wfMsgForContent( 'dellogpage' ),
- wfMsg( 'deletionlog' ) );
-
+
+ $loglink = '[[Special:Log/delete|' . wfMsg( 'deletionlog' ) . ']]';
$text = wfMsg( 'deletedtext', $deleted, $loglink );
-
- $wgOut->addHTML( '<p>' . $text . "</p>\n" );
+
+ $wgOut->addWikiText( $text );
$wgOut->returnToMain( false );
wfRunHooks('ArticleDeleteComplete', array(&$this, &$wgUser, $reason));
} else {
return false;
}
- $u = new SiteStatsUpdate( 0, 1, -$this->isCountable( $this->getContent( true ) ) );
+ $u = new SiteStatsUpdate( 0, 1, -$this->isCountable( $this->getContent( true ) ), -1 );
array_push( $wgDeferredUpdateList, $u );
$linksTo = $this->mTitle->getLinksTo();
$this->mTitle->getInternalURL(),
$this->mTitle->getInternalURL( 'history' )
);
- foreach ( $linksTo as $linkTo ) {
- $urls[] = $linkTo->getInternalURL();
- }
- $u = new SquidUpdate( $urls );
+ $u = SquidUpdate::newFromTitles( $linksTo, $urls );
array_push( $wgPostCommitUpdateList, $u );
}
# Client and file cache invalidation
Title::touchArray( $linksTo );
- # Move article and history to the "archive" table
- $dbw->insertSelect( 'archive', array( 'page','revision', 'text' ),
+ // For now, shunt the revision data into the archive table.
+ // Text is *not* removed from the text table; bulk storage
+ // is left intact to avoid breaking block-compression or
+ // immutable storage schemes.
+ //
+ // For backwards compatibility, note that some older archive
+ // table entries will have ar_text and ar_flags fields still.
+ //
+ // In the future, we may keep revisions and mark them with
+ // the rev_deleted field, which is reserved for this purpose.
+ $dbw->insertSelect( 'archive', array( 'page', 'revision' ),
array(
'ar_namespace' => 'page_namespace',
'ar_title' => 'page_title',
- 'ar_text' => 'old_text',
'ar_comment' => 'rev_comment',
'ar_user' => 'rev_user',
'ar_user_text' => 'rev_user_text',
'ar_timestamp' => 'rev_timestamp',
'ar_minor_edit' => 'rev_minor_edit',
- 'ar_flags' => 'old_flags',
'ar_rev_id' => 'rev_id',
+ 'ar_text_id' => 'rev_text_id',
), array(
- 'page_namespace' => $ns,
- 'page_title' => $t,
- 'page_id = rev_page AND old_id = rev_id'
+ 'page_id' => $id,
+ 'page_id = rev_page'
), $fname
);
# Now that it's safely backed up, delete it
-
- $dbw->deleteJoin( 'text', 'revision', 'old_id', 'rev_id', array( "rev_page = {$id}" ), $fname );
$dbw->delete( 'revision', array( 'rev_page' => $id ), $fname );
$dbw->delete( 'page', array( 'page_id' => $id ), $fname);
-
+
+ # Clean up recentchanges entries...
$dbw->delete( 'recentchanges', array( 'rc_namespace' => $ns, 'rc_title' => $t ), $fname );
# Finally, clean up the link tables
Article::onArticleDelete( $this->mTitle );
- # Insert broken links
- $brokenLinks = array();
- foreach ( $linksTo as $titleObj ) {
- # Get article ID. Efficient because it was loaded into the cache by getLinksTo().
- $linkID = $titleObj->getArticleID();
- $brokenLinks[] = array( 'bl_from' => $linkID, 'bl_to' => $t );
- }
- $dbw->insert( 'brokenlinks', $brokenLinks, $fname, 'IGNORE' );
-
- # Delete live links
- $dbw->delete( 'links', array( 'l_to' => $id ) );
- $dbw->delete( 'links', array( 'l_from' => $id ) );
+ # Delete outgoing links
+ $dbw->delete( 'pagelinks', array( 'pl_from' => $id ) );
$dbw->delete( 'imagelinks', array( 'il_from' => $id ) );
- $dbw->delete( 'brokenlinks', array( 'bl_from' => $id ) );
$dbw->delete( 'categorylinks', array( 'cl_from' => $id ) );
# Log the deletion
$wgOut->addHTML( wfMsg( 'cantrollback' ) );
return;
}
-
+
if ( $bot ) {
# Mark all reverted edits as bot
$dbw->update( 'recentchanges',
# Save it!
$target = Revision::newFromId( $s->rev_id );
$newcomment = wfMsg( 'revertpage', $target->getUserText(), $from );
-
+
$wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
$wgOut->addHTML( '<h2>' . htmlspecialchars( $newcomment ) . "</h2>\n<hr />\n" );
-
+
$this->updateArticle( $target->getText(), $newcomment, 1, $this->mTitle->userIsWatching(), $bot );
Article::onArticleEdit( $this->mTitle );
-
+
$dbw->commit();
$wgOut->returnToMain( false );
}
* @private
*/
function viewUpdates() {
- global $wgDeferredUpdateList;
-
+ global $wgDeferredUpdateList, $wgUseEnotif;
+
if ( 0 != $this->getID() ) {
global $wgDisableCounters;
if( !$wgDisableCounters ) {
array_push( $wgDeferredUpdateList, $u );
}
}
-
+
# Update newtalk status if user is reading their own
# talk page
global $wgUser;
if ($this->mTitle->getNamespace() == NS_USER_TALK &&
- $this->mTitle->getText() == $wgUser->getName()) {
- require_once( 'UserTalkUpdate.php' );
- $u = new UserTalkUpdate( 0, $this->mTitle->getNamespace(), $this->mTitle->getDBkey(), false, false, false );
- } else {
+ $this->mTitle->getText() == $wgUser->getName())
+ {
+ if ( $wgUseEnotif ) {
+ require_once( 'UserTalkUpdate.php' );
+ $u = new UserTalkUpdate( 0, $this->mTitle->getNamespace(), $this->mTitle->getDBkey(), false, false, false );
+ } else {
+ $wgUser->setNewtalk(0);
+ $wgUser->saveNewtalk();
+ }
+ } elseif ( $wgUseEnotif ) {
$wgUser->clearNotification( $this->mTitle );
}
*/
function editUpdates( $text, $summary, $minoredit, $timestamp_of_pagechange) {
global $wgDeferredUpdateList, $wgDBname, $wgMemc;
- global $wgMessageCache, $wgUser;
+ global $wgMessageCache, $wgUser, $wgUseEnotif;
wfSeedRandom();
if ( 0 == mt_rand( 0, 999 ) ) {
$title = $this->mTitle->getPrefixedDBkey();
$shortTitle = $this->mTitle->getDBkey();
- $adj = $this->mCountAdjustment;
-
if ( 0 != $id ) {
$u = new LinksUpdate( $id, $title );
array_push( $wgDeferredUpdateList, $u );
- $u = new SiteStatsUpdate( 0, 1, $adj );
+ $u = new SiteStatsUpdate( 0, 1, $this->mGoodAdjustment, $this->mTotalAdjustment );
array_push( $wgDeferredUpdateList, $u );
$u = new SearchUpdate( $id, $title, $text );
array_push( $wgDeferredUpdateList, $u );
- # If this is another user's talk page,
- # create a watchlist entry for this page
-
- if ($this->mTitle->getNamespace() == NS_USER_TALK &&
- $shortTitle != $wgUser->getName()) {
- require_once( 'UserTalkUpdate.php' );
- $u = new UserTalkUpdate( 1, $this->mTitle->getNamespace(), $shortTitle, $summary, $minoredit, $timestamp_of_pagechange);
+ # If this is another user's talk page, update newtalk
+
+ if ($this->mTitle->getNamespace() == NS_USER_TALK && $shortTitle != $wgUser->getName()) {
+ if ( $wgUseEnotif ) {
+ require_once( 'UserTalkUpdate.php' );
+ $u = new UserTalkUpdate( 1, $this->mTitle->getNamespace(), $shortTitle, $summary,
+ $minoredit, $timestamp_of_pagechange);
+ } else {
+ $other = User::newFromName($shortTitle);
+ if ($other) {
+ $other->setNewtalk(1);
+ $other->saveNewtalk();
+ }
+ }
}
if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
function setOldSubtitle( $oldid=0 ) {
global $wgLang, $wgOut, $wgUser;
+ $current = ( $oldid == $this->mLatest );
$td = $wgLang->timeanddate( $this->mTimestamp, true );
$sk = $wgUser->getSkin();
- $lnk = $sk->makeKnownLinkObj ( $this->mTitle, wfMsg( 'currentrevisionlink' ) );
+ $lnk = $current
+ ? wfMsg( 'currentrevisionlink' )
+ : $lnk = $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'currentrevisionlink' ) );
$prevlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'previousrevision' ), 'direction=prev&oldid='.$oldid );
- $nextlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'nextrevision' ), 'direction=next&oldid='.$oldid );
+ $nextlink = $current
+ ? wfMsg( 'nextrevision' )
+ : $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'nextrevision' ), 'direction=next&oldid='.$oldid );
$r = wfMsg( 'revisionasofwithlink', $td, $lnk, $prevlink, $nextlink );
$wgOut->setSubtitle( $r );
}
wfDebug( " tryFileCache() - not cacheable\n" );
}
}
-
+
/**
* Check if the page can be cached
* @return bool
$revisionId = $revision->insertOn( $dbw );
$this->updateRevisionOn( $dbw, $revision );
$dbw->commit();
-
+
wfProfileOut( $fname );
}
'GROUP BY hc_id');
$dbw->query("DELETE FROM $hitcounterTable");
$dbw->query('UNLOCK TABLES');
- $dbw->query("UPDATE $curTable,$acchitsTable SET cur_counter=cur_counter + hc_n ".
- 'WHERE cur_id = hc_id');
+ $dbw->query("UPDATE $pageTable,$acchitsTable SET page_counter=page_counter + hc_n ".
+ 'WHERE page_id = hc_id');
$dbw->query("DROP TABLE $acchitsTable");
ignore_user_abort( $old_user_abort );
* The onArticle*() functions are supposed to be a kind of hooks
* which should be called whenever any of the specified actions
* are done.
- *
+ *
* This is a good place to put code to clear caches, for instance.
- *
+ *
* This is called on page move and undelete, as well as edit
* @static
* @param $title_obj a title object
function onArticleCreate($title_obj) {
global $wgUseSquid, $wgPostCommitUpdateList;
- $titles = $title_obj->getBrokenLinksTo();
+ $title_obj->touchLinks();
+ $titles = $title_obj->getLinksTo();
# Purge squid
if ( $wgUseSquid ) {
$u = new SquidUpdate( $urls );
array_push( $wgPostCommitUpdateList, $u );
}
-
- # Clear persistent link cache
- LinkCache::linksccClearBrokenLinksTo( $title_obj->getPrefixedDBkey() );
}
function onArticleDelete($title_obj) {
- LinkCache::linksccClearLinksTo( $title_obj->getArticleID() );
+ $title_obj->touchLinks();
}
+
function onArticleEdit($title_obj) {
- LinkCache::linksccClearPage( $title_obj->getArticleID() );
+ // This would be an appropriate place to purge caches.
+ // Why's this not in here now?
}
+
/**#@-*/
/**
}
$page = $this->mTitle->getSubjectPage();
-
+
$wgOut->setPagetitle( $page->getPrefixedText() );
$wgOut->setSubtitle( wfMsg( 'infosubtitle' ));
if( !$exists ) {
$wgOut->addHTML( wfMsg('noarticletext') );
} else {
- $dbr =& $this->getDB( DB_SLAVE );
+ $dbr =& $this->getDB( DB_SLAVE );
$wl_clause = array(
'wl_title' => $page->getDBkey(),
'wl_namespace' => $page->getNamespace() );
$pageInfo = $this->pageCountInfo( $page );
$talkInfo = $this->pageCountInfo( $page->getTalkPage() );
-
+
$wgOut->addHTML( "<ul><li>" . wfMsg("numwatchers", $wgLang->formatNum( $numwatchers ) ) . '</li>' );
$wgOut->addHTML( "<li>" . wfMsg('numedits', $wgLang->formatNum( $pageInfo['edits'] ) ) . '</li>');
if( $talkInfo ) {
}
}
-
+
/**
* Return the total number of edits and number of unique editors
* on a given page. If page does not exist, returns false.
if( $id == 0 ) {
return false;
}
-
- $dbr =& $this->getDB( DB_SLAVE );
+
+ $dbr =& $this->getDB( DB_SLAVE );
$rev_clause = array( 'rev_page' => $id );
$fname = 'Article::pageCountInfo';
$rev_clause,
$fname,
$this->getSelectOptions() );
-
+
return array( 'edits' => $edits, 'authors' => $authors );
}
$id = $this->mTitle->getArticleID();
$db =& wfGetDB( DB_SLAVE );
- $page = $db->tableName( 'page' );
- $links = $db->tableName( 'links' );
- $sql = "SELECT page_title ".
- "FROM $page,$links WHERE l_to=page_id AND l_from={$id} and page_namespace=".NS_TEMPLATE;
- $res = $db->query( $sql, "Article:getUsedTemplates" );
+ $res = $db->select( array( 'pagelinks' ),
+ array( 'pl_title' ),
+ array(
+ 'pl_from' => $id,
+ 'pl_namespace' => NS_TEMPLATE ),
+ 'Article:getUsedTemplates' );
if ( false !== $res ) {
if ( $db->numRows( $res ) ) {
while ( $row = $db->fetchObject( $res ) ) {
- $result[] = $row->page_title;
+ $result[] = $row->pl_title;
}
}
}
dépôts / lhc / web / wiklou.git / blobdiff