more missing variable bugs

[lhc/web/wiklou.git] / includes / Article.php

diff --git a/includes/Article.php b/includes/Article.php
index 69833d3..c7f9649 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -750,7 +750,12 @@ class Article {
                                $wgOut->addWikiText( $text );
                        }
                }
-               $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+               /* title may have been set from the cache */
+               $t = $wgOut->getPageTitle();    
+               if( empty( $t ) ) {
+                       $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+               }
+
                # If we have been passed an &rcid= parameter, we want to give the user a
                # chance to mark this new article as patrolled.
                if ( $wgUseRCPatrol && !is_null ( $rcid ) && $rcid != 0 && $wgUser->isLoggedIn() &&
@@ -900,6 +905,7 @@ class Article {
                $ttl = $this->mTitle->getDBkey();
                $text = $this->preSaveTransform( $text );
                $isminor = ( $isminor && $wgUser->isLoggedIn() ) ? 1 : 0;
+               $now = wfTimestampNow();
 
                $dbw =& wfGetDB( DB_MASTER );
 
@@ -1087,6 +1093,7 @@ class Article {
 
                $text = $this->preSaveTransform( $text );
                $dbw =& wfGetDB( DB_MASTER );
+               $now = wfTimestampNow();
 
                # Update article, but only if changed.
 
@@ -1098,6 +1105,7 @@ class Article {
                }
 
                $oldtext = $this->getContent( true );
+               $lastRevision = 0;
 
                if ( 0 != strcmp( $text, $oldtext ) ) {
                        $this->mCountAdjustment = $this->isCountable( $text )
@@ -1124,7 +1132,7 @@ class Article {
                        } else {
                                # Update recentchanges and purge cache and whatnot
                                $bot = (int)($wgUser->isBot() || $forceBot);
-                               RecentChange::notifyEdit( $now, $this->mTitle, $me2, $wgUser, $summary,
+                               RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $wgUser, $summary,
                                        $lastRevision, $this->getTimestamp(), $bot );
                                Article::onArticleEdit( $this->mTitle );
                        }
@@ -1166,7 +1174,7 @@ class Article {
                                array_push( $wgPostCommitUpdateList, $u );
                        }
        
-                       $this->showArticle( $text, wfMsg( 'updated' ), $sectionanchor, $me2, $now, $summary, $lastRevision );
+                       $this->showArticle( $text, wfMsg( 'updated' ), $sectionanchor, $isminor, $now, $summary, $lastRevision );
                }
                return $good;
        }