Call finalCleanup() after outputting a cached page to run the deferred update list...

diff --git a/includes/Wiki.php b/includes/Wiki.php
index ed0a135..26912b3 100644 (file)
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -379,19 +379,19 @@ class MediaWiki {
         * Do a job from the job queue
         */
        function doJobs() {
-               $jobRunRate = $this->getVal( 'JobRunRate' );
+               global $wgJobRunRate;
 
-               if( $jobRunRate <= 0 || wfReadOnly() ) {
+               if( $wgJobRunRate <= 0 || wfReadOnly() ) {
                        return;
                }
-               if( $jobRunRate < 1 ) {
+               if( $wgJobRunRate < 1 ) {
                        $max = mt_getrandmax();
-                       if( mt_rand( 0, $max ) > $max * $jobRunRate ) {
+                       if( mt_rand( 0, $max ) > $max * $wgJobRunRate ) {
                                return;
                        }
                        $n = 1;
                } else {
-                       $n = intval( $jobRunRate );
+                       $n = intval( $wgJobRunRate );
                }
 
                while ( $n-- && false != ( $job = Job::pop() ) ) {

diff --git a/index.php b/index.php
index 7469866..90a0601 100644 (file)
--- a/index.php
+++ b/index.php
@@ -82,7 +82,10 @@ if( $wgUseFileCache && $wgTitle !== null ) {
                        # Do any stats increment/watchlist stuff
                        $wgArticle = MediaWiki::articleFromTitle( $wgTitle );
                        $wgArticle->viewUpdates();
+                       # Tell $wgOut that output is taken care of
+                       $wgOut->disable();
                        wfProfileOut( 'main-try-filecache' );
+                       $mediaWiki->finalCleanup( $wgOut );
                        $mediaWiki->restInPeace();
                        exit;
                }
@@ -96,7 +99,6 @@ $mediaWiki->setVal( 'DisabledActions', $wgDisabledActions );
 $mediaWiki->setVal( 'DisableHardRedirects', $wgDisableHardRedirects );
 $mediaWiki->setVal( 'EnableCreativeCommonsRdf', $wgEnableCreativeCommonsRdf );
 $mediaWiki->setVal( 'EnableDublinCoreRdf', $wgEnableDublinCoreRdf );
-$mediaWiki->setVal( 'JobRunRate', $wgJobRunRate );
 $mediaWiki->setVal( 'Server', $wgServer );
 $mediaWiki->setVal( 'SquidMaxage', $wgSquidMaxage );
 $mediaWiki->setVal( 'UseExternalEditor', $wgUseExternalEditor );
@@ -104,5 +106,4 @@ $mediaWiki->setVal( 'UsePathInfo', $wgUsePathInfo );
 
 $mediaWiki->performRequestForTitle( $wgTitle, $wgArticle, $wgOut, $wgUser, $wgRequest );
 $mediaWiki->finalCleanup( $wgOut );
-
 $mediaWiki->restInPeace();