More bugfixes. Fantastic. (and I tested, too! brion will be proud of me.)

diff --git a/includes/Article.php b/includes/Article.php
index 2aa733d..bfec500 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2801,7 +2801,6 @@ class Article {
         * Updates templatelinks if it is out of date.
         *
         * @param string  $text
-        * @param Article $article
         * @param bool    $cache
         */
        public function outputWikiText( $text, $cache = true ) {
@@ -2812,9 +2811,9 @@ class Article {
                $parserOutput = $wgParser->parse( $text, $this->mTitle,
                        $popts, true, true, $this->getRevIdFetched() );
                $popts->setTidy(false);
-               if ( $cache && $article && $parserOutput->getCacheTime() != -1 ) {
+               if ( $cache && $this && $parserOutput->getCacheTime() != -1 ) {
                        $parserCache =& ParserCache::singleton();
-                       $parserCache->save( $parserOutput, $article, $wgUser );
+                       $parserCache->save( $parserOutput, $this, $wgUser );
                }
 
                if ( !wfReadOnly() ) {
@@ -2833,6 +2832,8 @@ class Article {
                                array( 'tl_from' => $id ),
                                'Article:getUsedTemplates' );
 
+                       global $wgContLang;
+
                        if ( false !== $res ) {
                                if ( $dbr->numRows( $res ) ) {
                                        while ( $row = $dbr->fetchObject( $res ) ) {

diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index 1570a65..2f9ed54 100644 (file)
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -982,7 +982,7 @@ function do_restrictions_update() {
                                        $wgDatabase->insert( 'page_restrictions', array ( 'pr_page' => $id,
                                                                                                'pr_type' => $restriction_type,
                                                                                                'pr_level' => $restriction_level,
-                                                                                               'pr_cascade' => 0 ), __METHOD );
+                                                                                               'pr_cascade' => 0 ), __METHOD__ );
                                }
                        }
                }