fixed a few minor bugs and misc. notices

diff --git a/includes/Article.php b/includes/Article.php
index 6da535f..7b122d1 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1188,7 +1188,7 @@ class Article {
                        and ($this->getID() != 0)
                        and ($wgUser->getId() == 0)
                        and (!$wgUser->getNewtalk())
-                       and ($this->mTitle->getNamespace != Namespace::getSpecial())
+                       and ($this->mTitle->getNamespace() != Namespace::getSpecial())
                        and ($action == "view")
                        and (!isset($oldid))
                        and (!isset($diff))

diff --git a/includes/DateFormatter.php b/includes/DateFormatter.php
index a4a4282..7eb46b2 100755 (executable)
--- a/includes/DateFormatter.php
+++ b/includes/DateFormatter.php
@@ -25,7 +25,7 @@ class DateFormatter
        
        function DateFormatter()
        {
-               global $wgMonthNamesEn;
+               global $wgMonthNamesEn, $wgInputEncoding;
                
                $this->monthNames = $this->getMonthRegex();
                for ( $i=1; $i<=12; $i++ ) {

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 25f67bb..917735d 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -165,6 +165,7 @@ function logProfilingData()
        $elapsed = $now - $start;
        if ( "" != $wgDebugLogFile ) {
                $prof = wfGetProfilingOutput( $start, $elapsed );
+               $forward = "";
                if( !empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) )
                        $forward = " forwarded for " . $_SERVER['HTTP_X_FORWARDED_FOR'];
                if( !empty( $_SERVER['HTTP_CLIENT_IP'] ) )

diff --git a/includes/Setup.php b/includes/Setup.php
index 9e01fa4..dcb5378 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -43,7 +43,7 @@ global $wgUser, $wgLang, $wgOut, $wgTitle;
 global $wgArticle, $wgDeferredUpdateList, $wgLinkCache;
 global $wgMemc, $wgMagicWords, $wgMwRedir, $wgDebugLogFile;
 global $wgMessageCache, $wgUseMemCached, $wgUseDatabaseMessages;
-global $wgMsgCacheExpiry, $wgDBname;
+global $wgMsgCacheExpiry, $wgDBname, $wgCommandLineMode;
 
 class MemCachedClientforWiki extends MemCachedClient {
        function _debug( $text ) {

diff --git a/includes/Skin.php b/includes/Skin.php
index 59ed116..e5638f7 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -81,6 +81,8 @@ class Skin {
        }
        
        function outputPage( &$out ) {
+               global $wgDebugComments;
+               
                wfProfileIn( "Skin::outputPage" );
                $this->initPage();
                $out->out( $out->headElement() );
@@ -1045,7 +1047,7 @@ class Skin {
 
        function otherLanguages()
        {
-               global $wgOut, $wgLang, $wgTitle;
+               global $wgOut, $wgLang, $wgTitle, $wgUseNewInterlanguage;
 
                $a = $wgOut->getLanguageLinks();
                # TEST THIS @@@
@@ -1866,6 +1868,7 @@ class Skin {
        }
 
        function tocUnindent($level) {
+               $rv = "";
                while($level-->0) $rv.="</div>\n";
                return $rv;
        }