* Add support for a version key in $wgExtensionCredits
[lhc/web/wiklou.git] / includes / Article.php
index 7884185..e3ac744 100644 (file)
@@ -35,6 +35,7 @@ class Article {
        var $mForUpdate;
        var $mOldId;
        var $mRevIdFetched;
+       var $mRevision;
        /**#@-*/
 
        /**
@@ -51,7 +52,7 @@ class Article {
         * @public
         */
        function getTitle() {
-               return $this->mTitle;   
+               return $this->mTitle;
        }
 
        /**
@@ -61,7 +62,7 @@ class Article {
        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 = '';
@@ -80,11 +81,12 @@ class Article {
         * @return Return the text of this revision
        */
        function getContent( $noredir ) {
-               global $wgRequest, $wgUser;
+               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 );
@@ -92,9 +94,17 @@ class Article {
                if ( 0 == $this->getID() ) {
                        if ( 'edit' == $action ) {
                                wfProfileOut( $fname );
-                               return ''; # was "newarticletext", now moved above the box)
+                               
+                               # If requested, preload some text.
+                               $text=$this->getPreloadedText($preload);
+                               
+                               # We used to put MediaWiki:Newarticletext here if
+                               # $text was empty at this point.
+                               # This is now shown above the edit box instead.
+                               return $text;
                        }
                        wfProfileOut( $fname );
+                       $wgOut->setRobotpolicy( 'noindex,nofollow' );
                        return wfMsg( 'noarticletext' );
                } else {
                        $this->loadContent( $noredir );
@@ -110,7 +120,8 @@ class Article {
                                        if($section!='') {
                                                if($section=='new') {
                                                        wfProfileOut( $fname );
-                                                       return '';
+                                                       $text=$this->getPreloadedText($preload);
+                                                       return $text;
                                                }
 
                                                # strip NOWIKI etc. to avoid confusion (true-parameter causes HTML
@@ -126,6 +137,24 @@ class Article {
                }
        }
 
+       /**
+               This function accepts a title string as parameter
+               ($preload). If this string is non-empty, it attempts
+               to fetch the current revision text.
+       */
+       function getPreloadedText($preload) {
+               if($preload) {
+                       $preloadTitle=Title::newFromText($preload);
+                       if(isset($preloadTitle) && $preloadTitle->userCanRead()) {
+                       $rev=Revision::newFromTitle($preloadTitle);
+                       if($rev) {
+                               return $rev->getText();
+                               }
+                       }
+               }
+               return '';
+       }
+       
        /**
         * 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
@@ -213,7 +242,7 @@ class Article {
        function getOldID() {
                global $wgRequest, $wgOut;
                static $lastid;
-               
+
                if ( isset( $lastid ) ) {
                        return $lastid;
                }
@@ -249,7 +278,7 @@ class Article {
                global $wgOut, $wgRequest;
 
                if ( $this->mContentLoaded ) return;
-               
+
                # Query variables :P
                $oldid = $this->getOldID();
                $redirect = $wgRequest->getVal( 'redirect' );
@@ -266,8 +295,8 @@ class Article {
                $this->mOldId = $oldid;
                $this->fetchContent( $oldid, $noredir, true );
        }
-       
-       
+
+
        /**
         * Fetch a page record with the given conditions
         * @param Database $dbr
@@ -291,18 +320,18 @@ class Article {
                        $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.
@@ -311,25 +340,25 @@ class Article {
         * @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;
                }
@@ -420,18 +449,19 @@ class Article {
                                $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;
        }
 
@@ -489,6 +519,14 @@ class Article {
                }
        }
 
+       /**
+        * Returns true if this article exists in the database.
+        * @return bool
+        */
+       function exists() {
+               return $this->getId() != 0;
+       }
+
        /**
         * Get the view count for this article
         */
@@ -518,19 +556,30 @@ class 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.
@@ -538,7 +587,7 @@ class Article {
         */
        function loadLastEdit() {
                global $wgOut;
-               
+
                if ( -1 != $this->mUser )
                        return;
 
@@ -580,7 +629,7 @@ class Article {
                $this->loadLastEdit();
                return $this->mMinorEdit;
        }
-       
+
        function getRevIdFetched() {
                $this->loadLastEdit();
                return $this->mRevIdFetched;
@@ -628,7 +677,7 @@ class Article {
        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';
@@ -647,7 +696,7 @@ class Article {
                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;
@@ -660,7 +709,10 @@ class Article {
                        wfProfileOut( $fname );
                        return;
                }
+
                if ( empty( $oldid ) && $this->checkTouched() ) {
+                       $wgOut->setETag($wgParserCache->getETag($this, $wgUser));
+
                        if( $wgOut->checkLastModified( $this->mTouched ) ){
                                wfProfileOut( $fname );
                                return;
@@ -673,11 +725,11 @@ class Article {
                        }
                }
                # Should the parser cache be used?
-               if ( $wgEnableParserCache && intval($wgUser->getOption( 'stubthreshold' )) == 0 && empty( $oldid ) && $this->getID() ) {
-                       $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 ) {
@@ -695,7 +747,6 @@ class Article {
                                exit;
                        }
 
-
                        # We're looking at an old revision
 
                        if ( !empty( $oldid ) ) {
@@ -738,7 +789,7 @@ class Article {
 
                                $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);
@@ -748,11 +799,20 @@ class Article {
                                $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 );
+                               }
                        }
                }
                /* title may have been set from the cache */
-               $t = $wgOut->getPageTitle();    
+               $t = $wgOut->getPageTitle();
                if( empty( $t ) ) {
                        $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
                }
@@ -784,6 +844,13 @@ class Article {
                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
@@ -799,7 +866,7 @@ class Article {
        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,
@@ -814,13 +881,13 @@ class Article {
                        '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.
         *
@@ -837,7 +904,7 @@ class Article {
        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
@@ -854,11 +921,11 @@ class Article {
                        ),
                        $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.
@@ -869,7 +936,7 @@ class Article {
        function updateIfNewerOn( &$dbw, $revision ) {
                $fname = 'Article::updateIfNewerOn';
                wfProfileIn( $fname );
-               
+
                $row = $dbw->selectRow(
                        array( 'revision', 'page' ),
                        array( 'rev_id', 'rev_timestamp' ),
@@ -887,12 +954,12 @@ class Article {
                        # 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
@@ -900,7 +967,7 @@ class Article {
         * errors at some point.
         * @private
         */
-       function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false ) {
+       function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false, $comment=false ) {
                global $wgOut, $wgUser;
                global $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer;
 
@@ -911,6 +978,11 @@ class Article {
 
                $ns = $this->mTitle->getNamespace();
                $ttl = $this->mTitle->getDBkey();
+               
+               # If this is a comment, add the summary as headline
+               if($comment && $summary!="") {
+                       $text="== {$summary} ==\n\n".$text;
+               }
                $text = $this->preSaveTransform( $text );
                $isminor = ( $isminor && $wgUser->isLoggedIn() ) ? 1 : 0;
                $now = wfTimestampNow();
@@ -919,7 +991,7 @@ class Article {
 
                # Add the page record; stake our claim on this title!
                $newid = $this->insertOn( $dbw );
-               
+
                # Save the revision text...
                $revision = new Revision( array(
                        'page'       => $newid,
@@ -930,13 +1002,14 @@ class Article {
                $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) {
@@ -962,38 +1035,6 @@ class Article {
                $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)
-        * FIXME: This function is broken. Eliminate all uses and remove.
-        * Use Revision class in place.
-        */
-       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 ($section != '') {
@@ -1004,7 +1045,7 @@ class Article {
                                $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;
@@ -1077,10 +1118,10 @@ class Article {
        }
 
        /**
-        * 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 = '' ) {
@@ -1094,7 +1135,7 @@ class Article {
                $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 ) ) {
@@ -1118,6 +1159,8 @@ class Article {
                }
 
                $oldtext = $this->getContent( true );
+               $oldsize = strlen( $oldtext );
+               $newsize = strlen( $text );
                $lastRevision = 0;
 
                if ( 0 != strcmp( $text, $oldtext ) ) {
@@ -1128,7 +1171,7 @@ class Article {
 
                        $lastRevision = $dbw->selectField(
                                'page', 'page_latest', array( 'page_id' => $this->getId() ) );
-                       
+
                        $revision = new Revision( array(
                                'page'       => $this->getId(),
                                'comment'    => $summary,
@@ -1136,7 +1179,7 @@ class Article {
                                'text'       => $text
                                ) );
                        $revisionId = $revision->insertOn( $dbw );
-                       
+
                        # Update page
                        $ok = $this->updateRevisionOn( $dbw, $revision, $lastRevision );
 
@@ -1147,7 +1190,8 @@ class Article {
                                # Update recentchanges and purge cache and whatnot
                                $bot = (int)($wgUser->isBot() || $forceBot);
                                RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $wgUser, $summary,
-                                       $lastRevision, $this->getTimestamp(), $bot );
+                                       $lastRevision, $this->getTimestamp(), $bot, '', $oldsize, $newsize,
+                                       $revisionId );
                                Article::onArticleEdit( $this->mTitle );
                        }
                }
@@ -1166,8 +1210,8 @@ class Article {
                        }
                        # standard deferred updates
                        $this->editUpdates( $text, $summary, $minor, $now );
-       
-       
+
+
                        $urls = array();
                        # Template namespace
                        # Purge all articles linking here
@@ -1180,14 +1224,14 @@ class Article {
                                                }
                                }
                        }
-       
+
                        # 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, $isminor, $now, $summary, $lastRevision );
                }
                return $good;
@@ -1199,9 +1243,10 @@ class Article {
         */
        function showArticle( $text, $subtitle , $sectionanchor = '', $me2, $now, $summary, $oldid ) {
                global $wgUseDumbLinkUpdate, $wgAntiLockFlags, $wgOut, $wgUser, $wgLinkCache, $wgEnotif;
+               global $wgUseEnotif;
 
                $wgLinkCache = new LinkCache();
-               
+
                if ( !$wgUseDumbLinkUpdate ) {
                        # Preload links to reduce lock time
                        if ( $wgAntiLockFlags & ALF_PRELOAD_LINKS ) {
@@ -1209,26 +1254,13 @@ class Article {
                                $wgLinkCache->clear();
                        }
                }
-               # Parse the text and replace links with placeholders
-               # Do this outside the locks on the links table
-               # The existence test queries need to be FOR UPDATE
-               #$oldUpdate = $wgParser->forUpdate( true );
-               $wgOut = new OutputPage();
-               $wgOut->addWikiTextWithTitle( $text, $this->mTitle );
-
-               # Select for update
-               $wgLinkCache->forUpdate( true );
-
-               # Get old version of link table to allow incremental link updates
-               $wgLinkCache->preFill( $this->mTitle );
-               $wgLinkCache->clear();
 
                # Parse the text and replace links with placeholders
                $wgOut = new OutputPage();
-               
+
                # 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 
+               # pages created on file uploads); otherwise, link updates will
                # go wrong.
                $wgOut->addWikiTextWithTitle( $text, $this->mTitle );
 
@@ -1244,19 +1276,19 @@ class Article {
                        # Swap this old version back into its rightful place
                        $wgLinkCache->swapRegisters();
                }
-               
+
                if( $this->isRedirect( $text ) )
                        $r = 'redirect=no';
                else
                        $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( $this->mTitle, $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 );
+               }
        }
 
        /**
@@ -1302,18 +1334,18 @@ class Article {
         */
        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 ) ;
@@ -1321,16 +1353,16 @@ class Article {
                        $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() ) {
@@ -1343,7 +1375,7 @@ class Article {
                }
 
                if (wfRunHooks('WatchArticle', array(&$wgUser, &$this))) {
-                       
+
                        $wgUser->addWatch( $this->mTitle );
                        $wgUser->saveSettings();
 
@@ -1351,19 +1383,19 @@ class Article {
 
                        $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;
@@ -1378,20 +1410,20 @@ class Article {
                }
 
                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() );
        }
 
@@ -1436,7 +1468,7 @@ class Article {
                                $restrictions .= ":edit=" . $limit;
                        }
                        if (wfRunHooks('ArticleProtect', array(&$this, &$wgUser, $limit == 'sysop', $reason, $moveonly))) {
-                               
+
                                $dbw =& wfGetDB( DB_MASTER );
                                $dbw->update( 'page',
                                                          array( /* SET */
@@ -1446,9 +1478,9 @@ class Article {
                                                                                           '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 );
@@ -1472,7 +1504,7 @@ class Article {
 
                wfDebug( "Article::confirmProtect\n" );
 
-               $sub = htmlspecialchars( $this->mTitle->getPrefixedText() );
+               $sub = $this->mTitle->getPrefixedText();
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
 
                $check = '';
@@ -1597,7 +1629,7 @@ class Article {
 
                # Fetch cur_text
                $rev =& Revision::newFromTitle( $this->mTitle );
-               
+
                # Fetch name(s) of contributors
                $rev_name = '';
                $all_same_user = true;
@@ -1608,7 +1640,7 @@ class Article {
                                $rev_name = $row->rev_user_text;
                        }
                }
-               
+
                if( !is_null( $rev ) ) {
                        # if this is a mini-text, we can paste part of it into the deletion reason
                        $text = $rev->getText();
@@ -1617,7 +1649,7 @@ class Article {
                        $blanked = false;
                        if( $text == '' ) {
                                $prev = $rev->getPrevious();
-                               if( $prev ) { 
+                               if( $prev ) {
                                        $text = $prev->getText();
                                        $blanked = true;
                                }
@@ -1636,10 +1668,10 @@ class Article {
                                # space left
                                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 );
@@ -1710,18 +1742,14 @@ class Article {
                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_SPECIAL ) .
-                                                                                          ':Log/delete',
-                                                                                          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 {
@@ -1798,11 +1826,11 @@ class Article {
                                'page_id = rev_page'
                        ), $fname
                );
-               
+
                # Now that it's safely backed up, delete it
                $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 );
 
@@ -1902,7 +1930,7 @@ class Article {
                        $wgOut->addHTML( wfMsg( 'cantrollback' ) );
                        return;
                }
-               
+
                if ( $bot ) {
                        # Mark all reverted edits as bot
                        $dbw->update( 'recentchanges',
@@ -1919,14 +1947,14 @@ class Article {
                # 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 );
        }
@@ -1937,8 +1965,8 @@ class Article {
         * @private
         */
        function viewUpdates() {
-               global $wgDeferredUpdateList;
-               
+               global $wgDeferredUpdateList, $wgUseEnotif;
+
                if ( 0 != $this->getID() ) {
                        global $wgDisableCounters;
                        if( !$wgDisableCounters ) {
@@ -1947,17 +1975,22 @@ class Article {
                                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()) 
+                       $this->mTitle->getText() == $wgUser->getName())
                {
-                       require_once( 'UserTalkUpdate.php' );
-                       $u = new UserTalkUpdate( 0, $this->mTitle->getNamespace(), $this->mTitle->getDBkey(), false, false, false );
-               } else {
+                       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 );
                }
 
@@ -1971,7 +2004,7 @@ class Article {
         */
        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 ) ) {
@@ -1995,13 +2028,25 @@ class Article {
                        $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( is_null( $other ) && User::isIP( $shortTitle ) ) {
+                                               // An anonymous user
+                                               $other = new User();
+                                               $other->setName( $shortTitle );
+                                       }
+                                       if( $other ) {
+                                               $other->setNewtalk(1);
+                                               $other->saveNewtalk();
+                                       }
+                               }
                        }
 
                        if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
@@ -2018,11 +2063,16 @@ class Article {
        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 );
        }
@@ -2068,7 +2118,7 @@ class Article {
                        wfDebug( " tryFileCache() - not cacheable\n" );
                }
        }
-       
+
        /**
         * Check if the page can be cached
         * @return bool
@@ -2131,7 +2181,7 @@ class Article {
                $revisionId = $revision->insertOn( $dbw );
                $this->updateRevisionOn( $dbw, $revision );
                $dbw->commit();
-               
+
                wfProfileOut( $fname );
        }
 
@@ -2194,9 +2244,9 @@ class Article {
         * 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
@@ -2222,12 +2272,12 @@ class Article {
        function onArticleDelete($title_obj) {
                $title_obj->touchLinks();
        }
-       
+
        function onArticleEdit($title_obj) {
                // This would be an appropriate place to purge caches.
                // Why's this not in here now?
        }
-       
+
        /**#@-*/
 
        /**
@@ -2246,7 +2296,7 @@ class Article {
                }
 
                $page = $this->mTitle->getSubjectPage();
-               
+
                $wgOut->setPagetitle( $page->getPrefixedText() );
                $wgOut->setSubtitle( wfMsg( 'infosubtitle' ));
 
@@ -2255,7 +2305,7 @@ class Article {
                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() );
@@ -2268,7 +2318,7 @@ class Article {
 
                        $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 ) {
@@ -2282,7 +2332,7 @@ class Article {
 
                }
        }
-       
+
        /**
         * Return the total number of edits and number of unique editors
         * on a given page. If page does not exist, returns false.
@@ -2296,8 +2346,8 @@ class Article {
                if( $id == 0 ) {
                        return false;
                }
-               
-               $dbr =& $this->getDB( DB_SLAVE );       
+
+               $dbr =& $this->getDB( DB_SLAVE );
 
                $rev_clause = array( 'rev_page' => $id );
                $fname = 'Article::pageCountInfo';
@@ -2315,7 +2365,7 @@ class Article {
                        $rev_clause,
                        $fname,
                        $this->getSelectOptions() );
-               
+
                return array( 'edits' => $edits, 'authors' => $authors );
        }