Add categorylinks table to separately list category relationships. Actual
[lhc/web/wiklou.git] / includes / Article.php
index 807007f..6ccdb7b 100644 (file)
@@ -1,18 +1,11 @@
-<?
+<?php
 # Class representing a Wikipedia article and history.
 # See design.doc for an overview.
 
 # Note: edit user interface and cache support functions have been
 # moved to separate EditPage and CacheManager classes.
 
-/* CHECK MERGE @@@
-   TEST THIS @@@
-
-   * s/\$wgTitle/\$this->mTitle/ performed, many replacements
-   * mTitle variable added to class
-*/
-
-include_once( "CacheManager.php" );
+require_once( "CacheManager.php" );
 
 class Article {
        /* private */ var $mContent, $mContentLoaded;
@@ -69,10 +62,15 @@ class Article {
        # not told otherwise, and so may cause a change to mTitle.
 
        # Return the text of this revision
-       function getContent( $noredir = false )
+       function getContent( $noredir )
        {
-               global $action,$section,$count; # From query string
-               $fname =  "Article::getContent"; 
+               global $wgRequest;
+
+               # Get variables from query string :P
+               $action = $wgRequest->getText( 'action', 'view' );
+               $section = $wgRequest->getText( 'section' );
+
+               $fname =  "Article::getContent";
                wfProfileIn( $fname );
 
                if ( 0 == $this->getID() ) {
@@ -84,34 +82,29 @@ class Article {
                        return wfMsg( "noarticletext" );
                } else {
                        $this->loadContent( $noredir );
-                                               
+
                        if(
                                # check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page
                                ( $this->mTitle->getNamespace() == Namespace::getTalk( Namespace::getUser()) ) &&
                                  preg_match("/^\d{1,3}\.\d{1,3}.\d{1,3}\.\d{1,3}$/",$this->mTitle->getText()) &&
                                  $action=="view"
-                               ) 
+                               )
                                {
                                wfProfileOut( $fname );
                                return $this->mContent . "\n" .wfMsg("anontalkpagetext"); }
-                       else {                          
+                       else {
                                if($action=="edit") {
                                        if($section!="") {
-                                               if($section=="new") { 
+                                               if($section=="new") {
                                                        wfProfileOut( $fname );
-                                                       return ""; 
+                                                       return "";
                                                }
 
-                                               $secs=preg_split("/(^=+.*?=+|^<h[1-6].*?>.*?<\/h[1-6].*?>)/mi",
-                                                $this->mContent, -1,
-                                                PREG_SPLIT_DELIM_CAPTURE);
-                                               if($section==0) {
-                                                       wfProfileOut( $fname );
-                                                       return trim($secs[0]);
-                                               } else {
-                                                       wfProfileOut( $fname );
-                                                       return trim($secs[$section*2-1] . $secs[$section*2]);
-                                               }
+                                               # strip NOWIKI etc. to avoid confusion (true-parameter causes HTML
+                                               # comments to be stripped as well)
+                                               $rv=$this->getSection($this->mContent,$section);
+                                               wfProfileOut( $fname );
+                                               return $rv;
                                        }
                                }
                                wfProfileOut( $fname );
@@ -120,16 +113,96 @@ class Article {
                }
        }
        
+       # 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.
+       #
+       function getSection($text,$section)  {
+               
+               # strip NOWIKI etc. to avoid confusion (true-parameter causes HTML
+               # comments to be stripped as well)
+               $striparray=array();
+               $parser=new Parser();
+               $parser->mOutputType=OT_WIKI;
+               $striptext=$parser->strip($text, $striparray, true);
+
+               # now that we can be sure that no pseudo-sections are in the source,
+               # split it up by section
+               $secs =
+                 preg_split(
+                 "/(^=+.*?=+|^<h[1-6].*?" . ">.*?<\/h[1-6].*?" . ">)/mi",
+                 $striptext, -1,
+                 PREG_SPLIT_DELIM_CAPTURE);
+               if($section==0) {
+                       $rv=$secs[0];
+               } else {
+                       $headline=$secs[$section*2-1];
+                       preg_match( "/^(=+).*?=+|^<h([1-6]).*?>.*?<\/h[1-6].*?>/mi",$headline,$matches);
+                       $hlevel=$matches[1];
+                       
+                       # translate wiki heading into level
+                       if(strpos($hlevel,"=")!==false) {
+                               $hlevel=strlen($hlevel);                        
+                       }
+                       
+                       $rv=$headline. $secs[$section*2];
+                       $count=$section+1;
+                       
+                       $break=false;
+                       while(!empty($secs[$count*2-1]) && !$break) {
+                       
+                               $subheadline=$secs[$count*2-1];
+                               preg_match( "/^(=+).*?=+|^<h([1-6]).*?>.*?<\/h[1-6].*?>/mi",$subheadline,$matches);
+                               $subhlevel=$matches[1];
+                               if(strpos($subhlevel,"=")!==false) {
+                                       $subhlevel=strlen($subhlevel);                                          
+                               }
+                               if($subhlevel > $hlevel) {
+                                       $rv.=$subheadline.$secs[$count*2];
+                               }
+                               if($subhlevel <= $hlevel) {
+                                       $break=true;
+                               }
+                               $count++;
+                                               
+                       }
+               }
+               # reinsert stripped tags
+               $rv=$parser->unstrip($rv,$striparray);
+               $rv=trim($rv);
+               return $rv;
+
+       }
+       
+
        # Load the revision (including cur_text) into this object
        function loadContent( $noredir = false )
        {
-               global $wgOut, $wgMwRedir;
-               global $oldid, $redirect; # From query
+               global $wgOut, $wgMwRedir, $wgRequest;
+
+               # Query variables :P
+               $oldid = $wgRequest->getVal( 'oldid' );
+               $redirect = $wgRequest->getVal( 'redirect' );
 
                if ( $this->mContentLoaded ) return;
                $fname = "Article::loadContent";
-               $success = true;
                
+               # Pre-fill content with error message so that if something       
+               # fails we'll have something telling us what we intended.
+
+               $t = $this->mTitle->getPrefixedText();   
+               if ( isset( $oldid ) ) {         
+                       $oldid = IntVal( $oldid );       
+                       $t .= ",oldid={$oldid}";
+               }        
+               if ( isset( $redirect ) ) {      
+                       $redirect = ($redirect == "no") ? "no" : "yes";          
+                       $t .= ",redirect={$redirect}";   
+               }        
+               $this->mContent = wfMsg( "missingarticle", $t );
+       
                if ( ! $oldid ) {       # Retrieve current version
                        $id = $this->getID();
                        if ( 0 == $id ) return;
@@ -161,8 +234,7 @@ class Article {
                                                        return;
                                                }
                                                if ( $rt->getNamespace() == Namespace::getSpecial() ) {
-                                                       $wgOut->redirect( wfLocalUrl(
-                                                         $rt->getPrefixedURL() ) );
+                                                       $wgOut->redirect( $rt->getFullURL() );
                                                        return;
                                                }
                                                $rid = $rt->getArticleID();
@@ -190,35 +262,105 @@ class Article {
                        $this->mTitle->mRestrictionsLoaded = true;
                        wfFreeResult( $res );
                } else { # oldid set, retrieve historical version
-                       $sql = "SELECT old_text,old_timestamp,old_user,old_flags FROM old " .
+                       $sql = "SELECT old_namespace,old_title,old_text,old_timestamp,old_user,old_flags FROM old " .
                          "WHERE old_id={$oldid}";
                        $res = wfQuery( $sql, DB_READ, $fname );
-                       if ( 0 == wfNumRows( $res ) ) { return; }
+                       if ( 0 == wfNumRows( $res ) ) {
+                               return;
+                       }
 
                        $s = wfFetchObject( $res );
+                       if( $this->mTitle->getNamespace() != $s->old_namespace ||
+                               $this->mTitle->getDBkey() != $s->old_title ) {
+                               $oldTitle = Title::makeTitle( $s->old_namesapce, $s->old_title );
+                               $this->mTitle = $oldTitle;
+                               $wgTitle = $oldTitle;
+                       }
                        $this->mContent = Article::getRevisionText( $s );
                        $this->mUser = $s->old_user;
                        $this->mCounter = 0;
                        $this->mTimestamp = $s->old_timestamp;
                        wfFreeResult( $res );
                }
+               $this->mContentLoaded = true;
+               return $this->mContent;
+       }
 
-               # Return error message :P
-               # Horrible, confusing UI and data. I think this should return false on error -- TS
-               if ( !$success ) {
-                       $t = $this->mTitle->getPrefixedText();
-                       if ( isset( $oldid ) ) {
-                               $oldid = IntVal( $oldid );
-                               $t .= ",oldid={$oldid}";
+       # Gets the article text without using so many damn globals
+       # Returns false on error
+       function getContentWithoutUsingSoManyDamnGlobals( $oldid = 0, $noredir = false ) {
+               global $wgMwRedir;
+
+               if ( $this->mContentLoaded ) {
+                       return $this->mContent;
+               }
+               $this->mContent = false;
+               
+               $fname = "Article::loadContent";
+               
+               if ( ! $oldid ) {       # Retrieve current version
+                       $id = $this->getID();
+                       if ( 0 == $id ) {
+                               return false;
                        }
-                       if ( isset( $redirect ) ) {
-                               $redirect = ($redirect == "no") ? "no" : "yes";
-                               $t .= ",redirect={$redirect}";
+
+                       $sql = "SELECT " .
+                         "cur_text,cur_timestamp,cur_user,cur_counter,cur_restrictions,cur_touched " .
+                         "FROM cur WHERE cur_id={$id}";
+                       $res = wfQuery( $sql, DB_READ, $fname );
+                       if ( 0 == wfNumRows( $res ) ) { 
+                               return false; 
+                       }
+
+                       $s = wfFetchObject( $res );
+                       # If we got a redirect, follow it (unless we've been told
+                       # not to by either the function parameter or the query
+                       if ( !$noredir && $wgMwRedir->matchStart( $s->cur_text ) ) {
+                               if ( preg_match( "/\\[\\[([^\\]\\|]+)[\\]\\|]/",
+                                 $s->cur_text, $m ) ) {
+                                       $rt = Title::newFromText( $m[1] );
+                                       if( $rt &&  $rt->getInterwiki() == "" && $rt->getNamespace() != Namespace::getSpecial() ) {
+                                               $rid = $rt->getArticleID();
+                                               if ( 0 != $rid ) {
+                                                       $sql = "SELECT cur_text,cur_timestamp,cur_user," .
+                                                         "cur_counter,cur_restrictions,cur_touched FROM cur WHERE cur_id={$rid}";
+                                                       $res = wfQuery( $sql, DB_READ, $fname );
+       
+                                                       if ( 0 != wfNumRows( $res ) ) {
+                                                               $this->mRedirectedFrom = $this->mTitle->getPrefixedText();
+                                                               $this->mTitle = $rt;
+                                                               $s = wfFetchObject( $res );
+                                                       }
+                                               }
+                                       }
+                               }
                        }
-                       $this->mContent = wfMsg( "missingarticle", $t );
-               }
 
+                       $this->mContent = $s->cur_text;
+                       $this->mUser = $s->cur_user;
+                       $this->mCounter = $s->cur_counter;
+                       $this->mTimestamp = $s->cur_timestamp;
+                       $this->mTouched = $s->cur_touched;
+                       $this->mTitle->mRestrictions = explode( ",", trim( $s->cur_restrictions ) );
+                       $this->mTitle->mRestrictionsLoaded = true;
+                       wfFreeResult( $res );
+               } else { # oldid set, retrieve historical version
+                       $sql = "SELECT old_text,old_timestamp,old_user,old_flags FROM old " .
+                         "WHERE old_id={$oldid}";
+                       $res = wfQuery( $sql, DB_READ, $fname );
+                       if ( 0 == wfNumRows( $res ) ) { 
+                               return false; 
+                       }
+
+                       $s = wfFetchObject( $res );
+                       $this->mContent = Article::getRevisionText( $s );
+                       $this->mUser = $s->old_user;
+                       $this->mCounter = 0;
+                       $this->mTimestamp = $s->old_timestamp;
+                       wfFreeResult( $res );
+               }
                $this->mContentLoaded = true;
+               return $this->mContent;
        }
 
        function getID() {
@@ -305,32 +447,83 @@ class Article {
                return $this->mMinorEdit;
        }
 
+        function getContributors($limit = 0, $offset = 0)
+        {
+                $fname = "Article::getContributors";
+
+               # XXX: this is expensive; cache this info somewhere.
+               
+               $title = $this->mTitle;
+
+               $contribs = array();
+
+                $sql = "SELECT old.old_user, old.old_user_text, " .
+                       "  user.user_real_name, MAX(old.old_timestamp) as timestamp" .
+                       " FROM old, user " .
+                       " WHERE old.old_user = user.user_id " .
+                      " AND old.old_namespace = " . $title->getNamespace() .
+                       " AND old.old_title = \"" . $title->getDBkey() . "\"" .
+                       " AND old.old_user != 0 " .
+                       " AND old.old_user != " . $this->getUser() . 
+                       " GROUP BY old.old_user " . 
+                       " ORDER BY timestamp DESC ";
+
+                if ($limit > 0) {
+                        $sql .= " LIMIT $limit";
+                }
+
+               $res = wfQuery($sql, DB_READ, $fname);
+       
+               while ( $line = wfFetchObject( $res ) ) {
+                       $contribs[$line->old_user] = 
+                                array($line->old_user_text, $line->user_real_name);
+               }    
+
+                # Count anonymous users
+
+               $res = wfQuery("SELECT COUNT(*) AS cnt " .
+                              " FROM old " .
+                              " WHERE old_namespace = " . $title->getNamespace() .
+                              " AND old_title = '" . $title->getDBkey() . "'" .
+                               " AND old_user = 0 ", DB_READ, $fname);
+       
+               while ( $line = wfFetchObject( $res ) ) {
+                        $contribs[0] = array($line->cnt, 'Anonymous');
+               }    
+
+               return $contribs;
+       }
+    
        # This is the default action of the script: just view the page of
        # the given title.
 
        function view()
        {
-               global $wgUser, $wgOut, $wgLang;
-               global $oldid, $diff; # From query
-               global $wgLinkCache, $IP;
+               global $wgUser, $wgOut, $wgLang, $wgRequest;
+               global $wgLinkCache, $IP, $wgEnableParserCache;
+               
                $fname = "Article::view";
                wfProfileIn( $fname );
 
+               # Get variables from query string :P
+               $oldid = $wgRequest->getVal( 'oldid' );
+               $diff = $wgRequest->getVal( 'diff' );
+
                $wgOut->setArticleFlag( true );
                $wgOut->setRobotpolicy( "index,follow" );
 
                # If we got diff and oldid in the query, we want to see a
                # diff page instead of the article.
 
-               if ( isset( $diff ) ) {
+               if ( !is_null( $diff ) ) {
                        $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
-                       $de = new DifferenceEngine( $oldid, $diff );
+                       $de = new DifferenceEngine( intval($oldid), intval($diff) );
                        $de->showDiffPage();
                        wfProfileOut( $fname );
                        return;
                }
 
-               if ( !isset( $oldid ) and $this->checkTouched() ) {
+               if ( !is_null( $oldid ) and $this->checkTouched() ) {
                        if( $wgOut->checkLastModified( $this->mTouched ) ){
                                return;
                        } else if ( $this->tryFileCache() ) {
@@ -341,14 +534,20 @@ class Article {
                        }
                }
 
-               $text = $this->getContent(); # May change mTitle
+               $text = $this->getContent( false ); # May change mTitle by following a redirect
+               
+               # Another whitelist check in case oldid or redirects are altering the title
+               if ( !$this->mTitle->userCanRead() ) {
+                       $wgOut->loginToUse();
+                       $wgOut->output();
+                       exit;
+               }
+               
                $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
-               $wgOut->setHTMLTitle( $this->mTitle->getPrefixedText() .
-                 " - " . wfMsg( "wikititlesuffix" ) );
 
                # We're looking at an old revision
 
-               if ( $oldid ) {
+               if ( !empty( $oldid ) ) {
                        $this->setOldSubtitle();
                        $wgOut->setRobotpolicy( "noindex,follow" );
                }
@@ -361,7 +560,23 @@ class Article {
                }
 
                $wgLinkCache->preFill( $this->mTitle );
-               $wgOut->addWikiText( $text );
+
+               # wrap user css and user js in pre and don't parse
+               # XXX: use $this->mTitle->usCssJsSubpage() when php is fixed/ a workaround is found
+               if ( 
+                       $this->mTitle->getNamespace() == Namespace::getUser() && 
+                       preg_match("/\\/[\\w]+\\.(css|js)$/", $this->mTitle->getDBkey())
+               ) {
+                       $wgOut->addWikiText( wfMsg('usercssjs'));
+                       $wgOut->addHTML( '<pre>'.htmlspecialchars($this->mContent)."\n</pre>" );
+               } else if( $wgEnableParserCache && intval($wgUser->getOption( "stubthreshold" )) == 0 ){
+                       $wgOut->addWikiText( $text, true, $this );
+               } else {
+                       $wgOut->addWikiText( $text );
+               }
+
+               # Add link titles as META keywords
+               $wgOut->addMetaTags() ;
 
                $this->viewUpdates();
                wfProfileOut( $fname );
@@ -375,6 +590,7 @@ class Article {
        /* private */ function insertNewArticle( $text, $summary, $isminor, $watchthis )
        {
                global $wgOut, $wgUser, $wgLinkCache, $wgMwRedir;
+               global $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer;
                
                $fname = "Article::insertNewArticle";
 
@@ -390,6 +606,7 @@ class Article {
                $won = wfInvertTimestamp( $now );
                wfSeedRandom();
                $rand = number_format( mt_rand() / mt_getrandmax(), 12, ".", "" );
+               $isminor = ( $isminor && $wgUser->getID() ) ? 1 : 0;
                $sql = "INSERT INTO cur (cur_namespace,cur_title,cur_text," .
                  "cur_comment,cur_user,cur_timestamp,cur_minor_edit,cur_counter," .
                  "cur_restrictions,cur_user_text,cur_is_redirect," .
@@ -397,7 +614,7 @@ class Article {
                  wfStrencode( $text ) . "', '" .
                  wfStrencode( $summary ) . "', '" .
                  $wgUser->getID() . "', '{$now}', " .
-                 ( $isminor ? 1 : 0 ) . ", 0, '', '" .
+                 $isminor . ", 0, '', '" .
                  wfStrencode( $wgUser->getName() ) . "', $redir, 1, $rand, '{$now}', '{$won}')";
                $res = wfQuery( $sql, DB_WRITE, $fname );
 
@@ -420,34 +637,97 @@ class Article {
                $sql = "UPDATE cur set cur_touched='$now' WHERE cur_namespace=$talkns AND cur_title='" . wfStrencode( $ttl ) . "'";
                wfQuery( $sql, DB_WRITE );
                
+               # standard deferred updates
+               $this->editUpdates( $text );
+
                $this->showArticle( $text, wfMsg( "newarticle" ) );
        }
 
-       function updateArticle( $text, $summary, $minor, $watchthis, $section = "", $forceBot = false )
-       {
-               global $wgOut, $wgUser, $wgLinkCache;
-               global $wgDBtransactions, $wgMwRedir;
-               $fname = "Article::updateArticle";
 
+       /* Side effects: loads last edit */
+       function getTextOfLastEditWithSectionReplacedOrAdded($section, $text, $summary = ""){
                $this->loadLastEdit();
-
-               // insert updated section into old text if we have only edited part 
-               // of the article               
-               if ($section != "") {                   
-                       $oldtext=$this->getContent();
+               $oldtext = $this->getContent( true );           
+               if ($section != "") {
                        if($section=="new") {
                                if($summary) $subject="== {$summary} ==\n\n";
                                $text=$oldtext."\n\n".$subject.$text;
                        } else {
-                               $secs=preg_split("/(^=+.*?=+|^<h[1-6].*?>.*?<\/h[1-6].*?>)/mi",
+
+                               # strip NOWIKI etc. to avoid confusion (true-parameter causes HTML
+                               # comments to be stripped as well)
+                               $striparray=array();
+                               $parser=new Parser();
+                               $parser->mOutputType=OT_WIKI;
+                               $oldtext=$parser->strip($oldtext, $striparray, true);
+
+                               # now that we can be sure that no pseudo-sections are in the source,
+                               # split it up
+                               # Unfortunately we can't simply do a preg_replace because that might
+                               # replace the wrong section, so we have to use the section counter instead
+                               $secs=preg_split("/(^=+.*?=+|^<h[1-6].*?" . ">.*?<\/h[1-6].*?" . ">)/mi",
                                  $oldtext,-1,PREG_SPLIT_DELIM_CAPTURE);
                                $secs[$section*2]=$text."\n\n"; // replace with edited
-                               if($section) { $secs[$section*2-1]=""; } // erase old headline
-                               $text=join("",$secs);           
+                               
+                               # section 0 is top (intro) section
+                               if($section!=0) { 
+                                       
+                                       # headline of old section - we need to go through this section
+                                       # to determine if there are any subsections that now need to
+                                       # be erased, as the mother section has been replaced with
+                                       # the text of all subsections.
+                                       $headline=$secs[$section*2-1];
+                                       preg_match( "/^(=+).*?=+|^<h([1-6]).*?>.*?<\/h[1-6].*?>/mi",$headline,$matches);
+                                       $hlevel=$matches[1];
+                                       
+                                       # determine headline level for wikimarkup headings
+                                       if(strpos($hlevel,"=")!==false) {
+                                               $hlevel=strlen($hlevel);                        
+                                       }
+                                       
+                                       $secs[$section*2-1]=""; // erase old headline
+                                       $count=$section+1;
+                                       $break=false;
+                                       while(!empty($secs[$count*2-1]) && !$break) {
+                       
+                                               $subheadline=$secs[$count*2-1];
+                                               preg_match(
+                                                "/^(=+).*?=+|^<h([1-6]).*?>.*?<\/h[1-6].*?>/mi",$subheadline,$matches);
+                                               $subhlevel=$matches[1];
+                                               if(strpos($subhlevel,"=")!==false) {
+                                                       $subhlevel=strlen($subhlevel);          
+                                               }
+                                               if($subhlevel > $hlevel) {
+                                                       // erase old subsections
+                                                       $secs[$count*2-1]="";
+                                                       $secs[$count*2]="";
+                                               }
+                                               if($subhlevel <= $hlevel) {
+                                                       $break=true;
+                                               }
+                                               $count++;
+                                               
+                                       }
+                                       
+                               }
+                               $text=join("",$secs);
+                               # reinsert the stuff that we stripped out earlier
+                               $text=$parser->unstrip($text,$striparray);      
                        }
+                                                               
                }
+               return $text;
+       }
+
+       function updateArticle( $text, $summary, $minor, $watchthis, $forceBot = false, $sectionanchor = "" )
+       {
+               global $wgOut, $wgUser, $wgLinkCache;
+               global $wgDBtransactions, $wgMwRedir;
+               global $wgUseSquid, $wgInternalServer;
+               $fname = "Article::updateArticle";
+
                if ( $this->mMinorEdit ) { $me1 = 1; } else { $me1 = 0; }
-               if ( $minor ) { $me2 = 1; } else { $me2 = 0; }          
+               if ( $minor && $wgUser->getID() ) { $me2 = 1; } else { $me2 = 0; }              
                if ( preg_match( "/^((" . $wgMwRedir->getBaseRegex() . ")[^\\n]+)/i", $text, $m ) ) {
                        $redir = 1;
                        $text = $m[1] . "\n"; # Remove all content but redirect
@@ -503,8 +783,8 @@ class Article {
                        $oldid = wfInsertID( $res );
 
                        $bot = (int)($wgUser->isBot() || $forceBot);
-                       RecentChange::notifyEdit( $now, $this->mTitle, $me2, $wgUser, $this->getComment()
-                               $oldid, $this->getTimestamp() );
+                       RecentChange::notifyEdit( $now, $this->mTitle, $me2, $wgUser, $summary
+                               $oldid, $this->getTimestamp(), $bot );
                        Article::onArticleEdit( $this->mTitle );
                }
 
@@ -520,15 +800,38 @@ class Article {
                                $this->unwatch();
                        }
                }
+               # standard deferred updates
+               $this->editUpdates( $text );
+               
+               
+               $urls = array();
+               # Template namespace
+               # Purge all articles linking here
+               if ( $this->mTitle->getNamespace() == NS_TEMPLATE) {
+                       $titles = $this->mTitle->getLinksTo();
+                       Title::touchArray( $titles );
+                       if ( $wgUseSquid ) {
+                               foreach ( $titles as $title ) {
+                                       $urls[] = $title->getInternalURL();
+                               }
+                       }
+               }
+       
+               # Squid updates
+               if ( $wgUseSquid ) {
+                       $urls = array_merge( $urls, $this->mTitle->getSquidURLs() );
+                       $u = new SquidUpdate( $urls );
+                       $u->doUpdate();
+               }
 
-               $this->showArticle( $text, wfMsg( "updated" ) );
+               $this->showArticle( $text, wfMsg( "updated" ), $sectionanchor );
                return true;
        }
 
        # After we've either updated or inserted the article, update
        # the link tables and redirect to the new page.
 
-       function showArticle( $text, $subtitle )
+       function showArticle( $text, $subtitle , $sectionanchor = '' )
        {
                global $wgOut, $wgUser, $wgLinkCache;
                global $wgMwRedir;
@@ -543,12 +846,11 @@ class Article {
                $wgOut = new OutputPage();
                $wgOut->addWikiText( $text );
 
-               $this->editUpdates( $text );
                if( $wgMwRedir->matchStart( $text ) )
                        $r = "redirect=no";
                else
                        $r = "";
-               $wgOut->redirect( wfLocalUrl( $this->mTitle->getPrefixedURL(), $r ) );
+               $wgOut->redirect( $this->mTitle->getFullURL( $r ).$sectionanchor );
        }
 
        # Add this page to my watchlist
@@ -575,13 +877,13 @@ class Article {
                $wgOut->setRobotpolicy( "noindex,follow" );
 
                $sk = $wgUser->getSkin() ;
-               $link = $sk->makeKnownLink ( $this->mTitle->getPrefixedText() ) ;
+               $link = $this->mTitle->getPrefixedText();
 
                if($add)
                        $text = wfMsg( "addedwatchtext", $link );
                else
                        $text = wfMsg( "removedwatchtext", $link );
-               $wgOut->addHTML( $text );
+               $wgOut->addWikiText( $text );
 
                $up = new UserUpdate();
                array_push( $wgDeferredUpdateList, $up );
@@ -596,7 +898,7 @@ class Article {
 
        function protect( $limit = "sysop" )
        {
-               global $wgUser, $wgOut;
+               global $wgUser, $wgOut, $wgRequest;
 
                if ( ! $wgUser->isSysop() ) {
                        $wgOut->sysopRequired();
@@ -608,20 +910,94 @@ class Article {
                }
                $id = $this->mTitle->getArticleID();
                if ( 0 == $id ) {
-                       $wgOut->fatalEror( wfMsg( "badarticleerror" ) );
+                       $wgOut->fatalError( wfMsg( "badarticleerror" ) );
                        return;
                }
+
+               $confirm = $wgRequest->getBool( 'wpConfirmProtect' ) && $wgRequest->wasPosted();
+               $reason = $wgRequest->getText( 'wpReasonProtect' );
+
+               if ( $confirm ) {
+
         $sql = "UPDATE cur SET cur_touched='" . wfTimestampNow() . "'," .
                        "cur_restrictions='{$limit}' WHERE cur_id={$id}";
                wfQuery( $sql, DB_WRITE, "Article::protect" );
 
                $log = new LogPage( wfMsg( "protectlogpage" ), wfMsg( "protectlogtext" ) );
                if ( $limit === "" ) {
-                       $log->addEntry( wfMsg( "unprotectedarticle", $this->mTitle->getPrefixedText() ), "" );          
+                               $log->addEntry( wfMsg( "unprotectedarticle", $this->mTitle->getPrefixedText() ), $reason );
+               } else {
+                               $log->addEntry( wfMsg( "protectedarticle", $this->mTitle->getPrefixedText() ), $reason );
+               }
+               $wgOut->redirect( $this->mTitle->getFullURL() );
+                       return;
                } else {
-                       $log->addEntry( wfMsg( "protectedarticle", $this->mTitle->getPrefixedText() ), "" );
+                       $reason = htmlspecialchars( wfMsg( "protectreason" ) );
+                       return $this->confirmProtect( "", $reason, $limit );
                }
-               $wgOut->redirect( wfLocalUrl( $this->mTitle->getPrefixedURL() ) );
+       }
+
+               # Output protection confirmation dialog
+       function confirmProtect( $par, $reason, $limit = "sysop"  )
+       {
+               global $wgOut;
+
+               wfDebug( "Article::confirmProtect\n" );
+
+               $sub = htmlspecialchars( $this->mTitle->getPrefixedText() );
+               $wgOut->setRobotpolicy( "noindex,nofollow" );
+
+               $check = "";
+               $protcom = "";
+
+               if ( $limit === "" ) {
+                       $wgOut->setSubtitle( wfMsg( "unprotectsub", $sub ) );
+                       $wgOut->addWikiText( wfMsg( "confirmunprotecttext" ) );
+                       $check = htmlspecialchars( wfMsg( "confirmunprotect" ) );
+                       $protcom = htmlspecialchars( wfMsg( "unprotectcomment" ) );
+                       $formaction = $this->mTitle->escapeLocalURL( "action=unprotect" . $par );
+               } else {
+                       $wgOut->setSubtitle( wfMsg( "protectsub", $sub ) );
+                       $wgOut->addWikiText( wfMsg( "confirmprotecttext" ) );
+                       $check = htmlspecialchars( wfMsg( "confirmprotect" ) );
+                       $protcom = htmlspecialchars( wfMsg( "protectcomment" ) );
+                       $formaction = $this->mTitle->escapeLocalURL( "action=protect" . $par );
+               }
+
+               $confirm = htmlspecialchars( wfMsg( "confirm" ) );
+
+               $wgOut->addHTML( "
+<form id='protectconfirm' method='post' action=\"{$formaction}\">
+       <table border='0'>
+               <tr>
+                       <td align='right'>
+                               <label for='wpReasonProtect'>{$protcom}:</label>
+                       </td>
+                       <td align='left'>
+                               <input type='text' size='60' name='wpReasonProtect' id='wpReasonProtect' value=\"" . htmlspecialchars( $reason ) . "\" />
+                       </td>
+               </tr>
+               <tr>
+                       <td>&nbsp;</td>
+               </tr>
+               <tr>
+                       <td align='right'>
+                               <input type='checkbox' name='wpConfirmProtect' value='1' id='wpConfirmProtect' />
+                       </td>
+                       <td>
+                               <label for='wpConfirmProtect'>{$check}</label>
+                       </td>
+               </tr>
+               <tr>
+                       <td>&nbsp;</td>
+                       <td>
+                               <input type='submit' name='wpConfirmProtectB' value=\"{$confirm}\" />
+                       </td>
+               </tr>
+       </table>
+</form>\n" );
+
+               $wgOut->returnToMain( false );
        }
 
        function unprotect()
@@ -629,13 +1005,17 @@ class Article {
                return $this->protect( "" );
        }
 
+       # UI entry point for page deletion 
        function delete()
        {
-               global $wgUser, $wgOut, $wgMessageCache;
-               global $wpConfirm, $wpReason, $image, $oldimage;
-
+               global $wgUser, $wgOut, $wgMessageCache, $wgRequest;
+               $fname = "Article::delete";
+               $confirm = $wgRequest->getBool( 'wpConfirm' ) && $wgRequest->wasPosted();
+               $reason = $wgRequest->getText( 'wpReason' );
+               
                # This code desperately needs to be totally rewritten
                
+               # Check permissions
                if ( ( ! $wgUser->isSysop() ) ) {
                        $wgOut->sysopRequired();
                        return;
@@ -645,12 +1025,6 @@ class Article {
                        return;
                }
 
-               # Can't delete cached MediaWiki namespace (i.e. vital messages)
-               if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI && $wgMessageCache->isCacheable( $this->mTitle->getDBkey() ) ) {
-                       $wgOut->fatalError( wfMsg( "cannotdelete" ) );
-                       return;
-               }
-
                # Better double-check that it hasn't been deleted yet!
                $wgOut->setPagetitle( wfMsg( "confirmdelete" ) );
                if ( ( "" == trim( $this->mTitle->getText() ) )
@@ -659,8 +1033,8 @@ class Article {
                        return;
                }
 
-               if ( $_POST["wpConfirm"] ) {
-                       $this->doDelete();
+               if ( $confirm ) {
+                       $this->doDelete( $reason );
                        return;
                }
 
@@ -672,10 +1046,10 @@ class Article {
                $etitle = wfStrencode( $title );
                $sql = "SELECT old_text,old_flags FROM old WHERE old_namespace=$ns and old_title='$etitle' ORDER BY inverse_timestamp LIMIT 1";
                $res = wfQuery( $sql, DB_READ, $fname );
-               if( ($old=wfFetchObject($res)) && !$wpConfirm ) {
+               if( ($old=wfFetchObject($res)) && !$confirm ) {
                        $skin=$wgUser->getSkin();
-                       $wgOut->addHTML("<B>".wfMsg("historywarning"));
-                       $wgOut->addHTML( $skin->historyLink() ."</B><P>");
+                       $wgOut->addHTML("<b>".wfMsg("historywarning"));
+                       $wgOut->addHTML( $skin->historyLink() ."</b>");
                }
 
                $sql="SELECT cur_text FROM cur WHERE cur_namespace=$ns and cur_title='$etitle'";
@@ -685,12 +1059,13 @@ class Article {
                        # if this is a mini-text, we can paste part of it into the deletion reason
 
                        #if this is empty, an earlier revision may contain "useful" text
+                       $blanked = false;
                        if($s->cur_text!="") {
                                $text=$s->cur_text;
                        } else {
                                if($old) {
                                        $text = Article::getRevisionText( $old );
-                                       $blanked=1;
+                                       $blanked = true;
                                }
                                
                        }
@@ -699,10 +1074,11 @@ class Article {
                        
                        # 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 && !$wpReason) { $wpReason=wfmsg("exblank");}
-                       
+                       if($length == 0 && $reason === "") { 
+                               $reason = wfMsg("exblank");
+                       }
                        
-                       if($length < 500 && !$wpReason) {
+                       if($length < 500 && $reason === "") {
                                                                        
                                # comment field=255, let's grep the first 150 to have some user
                                # space left
@@ -713,22 +1089,22 @@ class Article {
                                $text=preg_replace("/\>/","&gt;",$text);
                                $text=preg_replace("/[\n\r]/","",$text);
                                if(!$blanked) {
-                                       $wpReason=wfMsg("excontent"). " '".$text;
+                                       $reason=wfMsg("excontent"). " '".$text;
                                } else {
-                                       $wpReason=wfMsg("exbeforeblank") . " '".$text;
+                                       $reason=wfMsg("exbeforeblank") . " '".$text;
                                }
-                               if($length>150) { $wpReason .= "..."; } # we've only pasted part of the text
-                               $wpReason.="'"; 
+                               if($length>150) { $reason .= "..."; } # we've only pasted part of the text
+                               $reason.="'"; 
                        }
                }
 
-               return $this->confirmDelete();
+               return $this->confirmDelete( "", $reason );
        }
        
-       function confirmDelete( $par = "" )
+       # Output deletion confirmation dialog
+       function confirmDelete( $par, $reason )
        {
                global $wgOut;
-               global $wpReason;
 
                wfDebug( "Article::confirmDelete\n" );
                
@@ -737,71 +1113,114 @@ class Article {
                $wgOut->setRobotpolicy( "noindex,nofollow" );
                $wgOut->addWikiText( wfMsg( "confirmdeletetext" ) );
 
-               $t = $this->mTitle->getPrefixedURL();
-
-               $formaction = wfEscapeHTML( wfLocalUrl( $t, "action=delete" . $par ) );
-               $confirm = wfMsg( "confirm" );
-               $check = wfMsg( "confirmcheck" );
-               $delcom = wfMsg( "deletecomment" );
+               $formaction = $this->mTitle->escapeLocalURL( "action=delete" . $par );
+               
+               $confirm = htmlspecialchars( wfMsg( "confirm" ) );
+               $check = htmlspecialchars( wfMsg( "confirmcheck" ) );
+               $delcom = htmlspecialchars( wfMsg( "deletecomment" ) );
 
                $wgOut->addHTML( "
-<form id=\"deleteconfirm\" method=\"post\" action=\"{$formaction}\">
-<table border=0><tr><td align=right>
-{$delcom}:</td><td align=left>
-<input type=text size=60 name=\"wpReason\" value=\"" . htmlspecialchars( $wpReason ) . "\">
-</td></tr><tr><td>&nbsp;</td></tr>
-<tr><td align=right>
-<input type=checkbox name=\"wpConfirm\" value='1' id=\"wpConfirm\">
-</td><td><label for=\"wpConfirm\">{$check}</label></td>
-</tr><tr><td>&nbsp;</td><td>
-<input type=submit name=\"wpConfirmB\" value=\"{$confirm}\">
-</td></tr></table></form>\n" );
+<form id='deleteconfirm' method='post' action=\"{$formaction}\">
+       <table border='0'>
+               <tr>
+                       <td align='right'>
+                               <label for='wpReason'>{$delcom}:</label>
+                       </td>
+                       <td align='left'>
+                               <input type='text' size='60' name='wpReason' id='wpReason' value=\"" . htmlspecialchars( $reason ) . "\" />
+                       </td>
+               </tr>
+               <tr>
+                       <td>&nbsp;</td>
+               </tr>
+               <tr>
+                       <td align='right'>
+                               <input type='checkbox' name='wpConfirm' value='1' id='wpConfirm' />
+                       </td>
+                       <td>
+                               <label for='wpConfirm'>{$check}</label>
+                       </td>
+               </tr>
+               <tr>
+                       <td>&nbsp;</td>
+                       <td>
+                               <input type='submit' name='wpConfirmB' value=\"{$confirm}\" />
+                       </td>
+               </tr>
+       </table>
+</form>\n" );
 
                $wgOut->returnToMain( false );
        }
 
-       function doDelete()
+       # Perform a deletion and output success or failure messages
+       function doDelete( $reason )
        {
                global $wgOut, $wgUser, $wgLang;
-               global $wpReason;
                $fname = "Article::doDelete";
                wfDebug( "$fname\n" );
 
-               $this->doDeleteArticle( $this->mTitle );
-               $deleted = $this->mTitle->getPrefixedText();
+               if ( $this->doDeleteArticle( $reason ) ) {      
+                       $deleted = $this->mTitle->getPrefixedText();
 
-               $wgOut->setPagetitle( wfMsg( "actioncomplete" ) );
-               $wgOut->setRobotpolicy( "noindex,nofollow" );
+                       $wgOut->setPagetitle( wfMsg( "actioncomplete" ) );
+                       $wgOut->setRobotpolicy( "noindex,nofollow" );
 
-               $sk = $wgUser->getSkin();
-               $loglink = $sk->makeKnownLink( $wgLang->getNsText(
-                 Namespace::getWikipedia() ) .
-                 ":" . wfMsg( "dellogpage" ), wfMsg( "deletionlog" ) );
+                       $sk = $wgUser->getSkin();
+                       $loglink = $sk->makeKnownLink( $wgLang->getNsText(
+                         Namespace::getWikipedia() ) .
+                         ":" . wfMsg( "dellogpage" ), wfMsg( "deletionlog" ) );
 
-               $text = wfMsg( "deletedtext", $deleted, $loglink );
+                       $text = wfMsg( "deletedtext", $deleted, $loglink );
 
-               $wgOut->addHTML( "<p>" . $text );
-               $wgOut->returnToMain( false );
+                       $wgOut->addHTML( "<p>" . $text . "</p>\n" );
+                       $wgOut->returnToMain( false );
+               } else {
+                       $wgOut->fatalError( wfMsg( "cannotdelete" ) );
+               }
        }
 
-       function doDeleteArticle( $title )
+       # Back-end article deletion
+       # Deletes the article with database consistency, writes logs, purges caches
+       # Returns success
+       function doDeleteArticle( $reason )
        {
-               global $wgUser, $wgOut, $wgLang, $wpReason, $wgDeferredUpdateList;
+               global $wgUser, $wgLang;
+               global  $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer;
 
                $fname = "Article::doDeleteArticle";
                wfDebug( "$fname\n" );
 
-               $ns = $title->getNamespace();
-               $t = wfStrencode( $title->getDBkey() );
-               $id = $title->getArticleID();
+               $ns = $this->mTitle->getNamespace();
+               $t = wfStrencode( $this->mTitle->getDBkey() );
+               $id = $this->mTitle->getArticleID();
 
-               if ( "" == $t ) {
-                       $wgOut->fatalError( wfMsg( "cannotdelete" ) );
-                       return;
+               if ( "" == $t || $id == 0 ) {
+                       return false;
                }
 
                $u = new SiteStatsUpdate( 0, 1, -$this->isCountable( $this->getContent( true ) ) );
                array_push( $wgDeferredUpdateList, $u );
+               
+               $linksTo = $this->mTitle->getLinksTo();
+
+               # Squid purging
+               if ( $wgUseSquid ) {
+                       $urls = array(  
+                               $this->mTitle->getInternalURL(),
+                               $this->mTitle->getInternalURL( "history" ) 
+                       );
+                       foreach ( $linksTo as $linkTo ) {
+                               $urls[] = $linkTo->getInternalURL();
+                       }
+
+                       $u = new SquidUpdate( $urls );
+                       array_push( $wgDeferredUpdateList, $u );
+
+               }
+
+               # Client and file cache invalidation
+               Title::touchArray( $linksTo );
 
                # Move article and history to the "archive" table
                $sql = "INSERT INTO archive (ar_namespace,ar_title,ar_text," .
@@ -833,75 +1252,64 @@ class Article {
                        wfQuery( $sql, DB_WRITE, $fname );
 
                # Finally, clean up the link tables
+               $t = wfStrencode( $this->mTitle->getPrefixedDBkey() );
 
-               if ( 0 != $id ) {
-
-                       $t = wfStrencode( $title->getPrefixedDBkey() );
-
-                       Article::onArticleDelete( $title );
-
-                       $sql = "SELECT l_from FROM links WHERE l_to={$id}";
-                       $res = wfQuery( $sql, DB_READ, $fname );
-
-                       $sql = "INSERT INTO brokenlinks (bl_from,bl_to) VALUES ";
-                       $now = wfTimestampNow();
-                       $sql2 = "UPDATE cur SET cur_touched='{$now}' WHERE cur_id IN (";
-                       $first = true;
-
-                       while ( $s = wfFetchObject( $res ) ) {
-                               $nt = Title::newFromDBkey( $s->l_from );
-                               $lid = $nt->getArticleID();
-
-                               if ( ! $first ) { $sql .= ","; $sql2 .= ","; }
-                               $first = false;
-                               $sql .= "({$lid},'{$t}')";
-                               $sql2 .= "{$lid}";
-                       }
-                       $sql2 .= ")";
-                       if ( ! $first ) {
-                               wfQuery( $sql, DB_WRITE, $fname );
-                               wfQuery( $sql2, DB_WRITE, $fname );
-                       }
-                       wfFreeResult( $res );
-
-                       $sql = "DELETE FROM links WHERE l_to={$id}";
+               Article::onArticleDelete( $this->mTitle );
+               
+               $sql = "INSERT INTO brokenlinks (bl_from,bl_to) VALUES ";
+               $first = true;
+
+               foreach ( $linksTo as $titleObj ) {
+                       if ( ! $first ) { $sql .= ","; }
+                       $first = false;
+                       # Get article ID. Efficient because it was loaded into the cache by getLinksTo().
+                       $linkID = $titleObj->getArticleID(); 
+                       $sql .= "({$linkID},'{$t}')";
+               }
+               if ( ! $first ) {
                        wfQuery( $sql, DB_WRITE, $fname );
+               }
 
-                       $sql = "DELETE FROM links WHERE l_from='{$t}'";
-                       wfQuery( $sql, DB_WRITE, $fname );
+               $sql = "DELETE FROM links WHERE l_to={$id}";
+               wfQuery( $sql, DB_WRITE, $fname );
 
-                       $sql = "DELETE FROM imagelinks WHERE il_from='{$t}'";
-                       wfQuery( $sql, DB_WRITE, $fname );
+               $sql = "DELETE FROM links WHERE l_from={$id}";
+               wfQuery( $sql, DB_WRITE, $fname );
 
-                       $sql = "DELETE FROM brokenlinks WHERE bl_from={$id}";
-                       wfQuery( $sql, DB_WRITE, $fname );
-               }
+               $sql = "DELETE FROM imagelinks WHERE il_from={$id}";
+               wfQuery( $sql, DB_WRITE, $fname );
+
+               $sql = "DELETE FROM brokenlinks WHERE bl_from={$id}";
+               wfQuery( $sql, DB_WRITE, $fname );
+               
+               $sql = "DELETE FROM categorylinks WHERE cl_from={$id}";
+               wfQuery( $sql, DB_WRITE, $fname );
                
                $log = new LogPage( wfMsg( "dellogpage" ), wfMsg( "dellogpagetext" ) );
-               $art = $title->getPrefixedText();
-               $wpReason = wfCleanQueryVar( $wpReason );
-               $log->addEntry( wfMsg( "deletedarticle", $art ), $wpReason );
+               $art = $this->mTitle->getPrefixedText();
+               $log->addEntry( wfMsg( "deletedarticle", $art ), $reason );
 
                # Clear the cached article id so the interface doesn't act like we exist
                $this->mTitle->resetArticleID( 0 );
                $this->mTitle->mArticleID = 0;
+               return true;
        }
 
        function rollback()
        {
-               global $wgUser, $wgLang, $wgOut, $from;
+               global $wgUser, $wgLang, $wgOut, $wgRequest;
 
                if ( ! $wgUser->isSysop() ) {
                        $wgOut->sysopRequired();
                        return;
                }
                if ( wfReadOnly() ) {
-                       $wgOut->readOnlyPage( $this->getContent() );
+                       $wgOut->readOnlyPage( $this->getContent( true ) );
                        return;
                }
                
-               # Secret enhanced rollback, marks edits rc_bot=1
-               $bot = !!$_REQUEST['bot'];
+               # Enhanced rollback, marks edits rc_bot=1
+               $bot = $wgRequest->getBool( 'bot' );
                
                # Replace all this user's current edits with the next one down
                $tt = wfStrencode( $this->mTitle->getDBKey() );
@@ -920,7 +1328,7 @@ class Article {
                $uid = $s->cur_user;
                $pid = $s->cur_id;
                
-               $from = str_replace( '_', ' ', wfCleanQueryVar( $from ) );
+               $from = str_replace( '_', ' ', $wgRequest->getVal( "from" ) );
                if( $from != $s->cur_user_text ) {
                        $wgOut->setPageTitle(wfmsg("rollbackfailed"));
                        $wgOut->addWikiText( wfMsg( "alreadyrolled",
@@ -931,7 +1339,7 @@ class Article {
                                $wgOut->addHTML(
                                        wfMsg("editcomment",
                                        htmlspecialchars( $s->cur_comment ) ) );
-                               }
+                       }
                        return;
                }
                
@@ -958,12 +1366,11 @@ class Article {
                }
 
                # Save it!
-               $newcomment = wfMsg( "revertpage", $s->old_user_text );
+               $newcomment = wfMsg( "revertpage", $s->old_user_text, $from );
                $wgOut->setPagetitle( wfMsg( "actioncomplete" ) );
                $wgOut->setRobotpolicy( "noindex,nofollow" );
-               $wgOut->addHTML( "<h2>" . $newcomment . "</h2>\n<hr>\n" );
-               $this->updateArticle( Article::getRevisionText( $s ), $newcomment, 1, $this->mTitle->userIsWatching(), "", $bot );
-               
+               $wgOut->addHTML( "<h2>" . $newcomment . "</h2>\n<hr />\n" );
+               $this->updateArticle( Article::getRevisionText( $s ), $newcomment, 1, $this->mTitle->userIsWatching(), $bot );
                Article::onArticleEdit( $this->mTitle );
                $wgOut->returnToMain( false );
        }
@@ -1038,89 +1445,13 @@ class Article {
 
        function preSaveTransform( $text )
        {
-               $s = "";
-               while ( "" != $text ) {
-                       $p = preg_split( "/<\\s*nowiki\\s*>/i", $text, 2 );
-                       $s .= $this->pstPass2( $p[0] );
-
-                       if ( ( count( $p ) < 2 ) || ( "" == $p[1] ) ) { $text = ""; }
-                       else {
-                               $q = preg_split( "/<\\/\\s*nowiki\\s*>/i", $p[1], 2 );
-                               $s .= "<nowiki>{$q[0]}</nowiki>";
-                               $text = $q[1];
-                       }
-               }
-               return rtrim( $s );
-       }
-
-       /* private */ function pstPass2( $text )
-       {
-               global $wgUser, $wgLang, $wgLocaltimezone;
-
-               # Signatures
-               #
-               $n = $wgUser->getName();
-               $k = $wgUser->getOption( "nickname" );
-               if ( "" == $k ) { $k = $n; }
-               if(isset($wgLocaltimezone)) {
-                       $oldtz = getenv("TZ"); putenv("TZ=$wgLocaltimezone");
-               }
-               /* Note: this is an ugly timezone hack for the European wikis */
-               $d = $wgLang->timeanddate( date( "YmdHis" ), false ) .
-                 " (" . date( "T" ) . ")";
-               if(isset($wgLocaltimezone)) putenv("TZ=$oldtz");
-
-               $text = preg_replace( "/~~~~/", "[[" . $wgLang->getNsText(
-                 Namespace::getUser() ) . ":$n|$k]] $d", $text );
-               $text = preg_replace( "/~~~/", "[[" . $wgLang->getNsText(
-                 Namespace::getUser() ) . ":$n|$k]]", $text );
-
-               # Context links: [[|name]] and [[name (context)|]]
-               #
-               $tc = "[&;%\\-,.\\(\\)' _0-9A-Za-z\\/:\\x80-\\xff]";
-               $np = "[&;%\\-,.' _0-9A-Za-z\\/:\\x80-\\xff]"; # No parens
-               $namespacechar = '[ _0-9A-Za-z\x80-\xff]'; # Namespaces can use non-ascii!
-               $conpat = "/^({$np}+) \\(({$tc}+)\\)$/";
-
-               $p1 = "/\[\[({$np}+) \\(({$np}+)\\)\\|]]/";             # [[page (context)|]]
-               $p2 = "/\[\[\\|({$tc}+)]]/";                                    # [[|page]]
-               $p3 = "/\[\[($namespacechar+):({$np}+)\\|]]/";          # [[namespace:page|]]
-               $p4 = "/\[\[($namespacechar+):({$np}+) \\(({$np}+)\\)\\|]]/";
-                                                                                                               # [[ns:page (cont)|]]
-               $context = "";
-               $t = $this->mTitle->getText();
-               if ( preg_match( $conpat, $t, $m ) ) {
-                       $context = $m[2];
-               }
-               $text = preg_replace( $p4, "[[\\1:\\2 (\\3)|\\2]]", $text );
-               $text = preg_replace( $p1, "[[\\1 (\\2)|\\1]]", $text );
-               $text = preg_replace( $p3, "[[\\1:\\2|\\2]]", $text );
-
-               if ( "" == $context ) {
-                       $text = preg_replace( $p2, "[[\\1]]", $text );
-               } else {
-                       $text = preg_replace( $p2, "[[\\1 ({$context})|\\1]]", $text );
-               }
-               
-               # {{SUBST:xxx}} variables
-               #
-               $mw =& MagicWord::get( MAG_SUBST );
-               $text = $mw->substituteCallback( $text, "wfReplaceSubstVar" );
-
-/* Experimental:
-               # Trim trailing whitespace
-               # MAG_END (__END__) tag allows for trailing 
-               # whitespace to be deliberately included
-               $text = rtrim( $text );
-               $mw =& MagicWord::get( MAG_END );
-               $mw->matchAndRemove( $text );
-*/
-               return $text;
+               global $wgParser, $wgUser;
+               return $wgParser->preSaveTransform( $text, $this->mTitle, $wgUser, ParserOptions::newFromUser( $wgUser ) );
        }
-
+       
        /* Caching functions */
 
-       # checkLastModified returns true iff it has taken care of all
+       # checkLastModified returns true if it has taken care of all
        # output to the client that is necessary for this request.
        # (that is, it has sent a cached version of the page)
        function tryFileCache() {
@@ -1153,8 +1484,9 @@ class Article {
        }
 
        function isFileCacheable() {
-               global $wgUser, $wgUseFileCache, $wgShowIPinHeader;
-               global $action, $oldid, $diff, $redirect, $printable;
+               global $wgUser, $wgUseFileCache, $wgShowIPinHeader, $wgRequest;
+               extract( $wgRequest->getValues( 'action', 'oldid', 'diff', 'redirect', 'printable' ) );
+               
                return $wgUseFileCache
                        and (!$wgShowIPinHeader)
                        and ($this->getID() != 0)
@@ -1184,13 +1516,21 @@ class Article {
        /* static */ function incViewCount( $id )
        {
                $id = intval( $id );
+               global $wgHitcounterUpdateFreq;
+
+               if( $wgHitcounterUpdateFreq <= 1 ){ // 
+                       wfQuery("UPDATE cur SET cur_counter = cur_counter + 1 " .
+                               "WHERE cur_id = $id", DB_WRITE);
+                       return;
+               }
 
                # Not important enough to warrant an error page in case of failure
                $oldignore = wfIgnoreSQLErrors( true ); 
 
                wfQuery("INSERT INTO hitcounter (hc_id) VALUES ({$id})", DB_WRITE);
 
-               if( (rand() % 23 != 0) or (wfLastErrno() != 0) ){
+               $checkfreq = intval( $wgHitcounterUpdateFreq/25 + 1 );
+               if( (rand() % $checkfreq != 0) or (wfLastErrno() != 0) ){
                        # Most of the time (or on SQL errors), skip row count check
                        wfIgnoreSQLErrors( $oldignore );
                        return;
@@ -1199,7 +1539,7 @@ class Article {
                $res = wfQuery("SELECT COUNT(*) as n FROM hitcounter", DB_WRITE);
                $row = wfFetchObject( $res );
                $rown = intval( $row->n );
-               if( $rown > 1000 ){ // update counters after ~1000 hits
+               if( $rown >= $wgHitcounterUpdateFreq ){ 
                        wfProfileIn( "Article::incViewCount-collect" );
                        $old_user_abort = ignore_user_abort( true );
 
@@ -1225,11 +1565,28 @@ class Article {
        #
        # 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 */ function onArticleCreate($title_obj){
-               global $wgEnablePersistentLC, $wgEnableParserCache;
+               global $wgEnablePersistentLC, $wgEnableParserCache, $wgUseSquid, $wgDeferredUpdateList;
+
+               $titles = $title_obj->getBrokenLinksTo();
+               
+               # Purge squid 
+               if ( $wgUseSquid ) {
+                       $urls = $title_obj->getSquidURLs();
+                       foreach ( $titles as $linkTitle ) {
+                               $urls[] = $linkTitle->getInternalURL();
+                       }
+                       $u = new SquidUpdate( $urls );
+                       array_push( $wgDeferredUpdateList, $u );
+               }
+
+               # Clear persistent link cache
                if ( $wgEnablePersistentLC ) {
                        LinkCache::linksccClearBrokenLinksTo( $title_obj->getPrefixedDBkey() );
                }
+
+               # Clear parser cache (not really used)
                if ( $wgEnableParserCache ) {
                        OutputPage::parsercacheClearBrokenLinksTo( $title_obj->getPrefixedDBkey() );
                }
@@ -1251,13 +1608,9 @@ class Article {
                        LinkCache::linksccClearPage( $title_obj->getArticleID() );
                }
                if ( $wgEnableParserCache ) {
-                       OutputPage::parsercacheClearPage( $title_obj->getArticleID() );
+                       OutputPage::parsercacheClearPage( $title_obj->getArticleID(), $title_obj->getNamespace() );
                }
        }
 }
 
-function wfReplaceSubstVar( $matches ) {
-       return wfMsg( $matches[1] );
-}
-
 ?>