Don't hang up page views with jobs

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

diff --git a/includes/Wiki.php b/includes/Wiki.php
index fa49290..c87f078 100644 (file)
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -60,6 +60,7 @@ class MediaWiki {
                        } elseif( is_string( $new_article ) ) {
                                $output->redirect( $new_article );
                        } else {
+                               wfProfileOut( __METHOD__ );
                                throw new MWException( "Shouldn't happen: MediaWiki::initializeArticle() returned neither an object nor a URL" );
                        }
                }
@@ -251,12 +252,12 @@ class MediaWiki {
                }
 
                switch( $title->getNamespace() ) {
-               case NS_IMAGE:
-                       return new ImagePage( $title );
-               case NS_CATEGORY:
-                       return new CategoryPage( $title );
-               default:
-                       return new Article( $title );
+                       case NS_IMAGE:
+                               return new ImagePage( $title );
+                       case NS_CATEGORY:
+                               return new CategoryPage( $title );
+                       default:
+                               return new Article( $title );
                }
        }
 
@@ -274,8 +275,6 @@ class MediaWiki {
                $action = $this->getVal( 'action' );
                $article = self::articleFromTitle( $title );
                
-               wfDebug("Article: ".$title->getPrefixedText()."\n");
-               
                // Namespace might change when using redirects
                // Check for redirects ...
                $file = $title->getNamespace() == NS_IMAGE ? $article->getFile() : null;
@@ -329,12 +328,16 @@ class MediaWiki {
         */
        function finalCleanup ( &$deferredUpdates, &$output ) {
                wfProfileIn( __METHOD__ );
-               $this->doUpdates( $deferredUpdates );
-               $this->doJobs();
                # Now commit any transactions, so that unreported errors after output() don't roll back the whole thing
                $factory = wfGetLBFactory();
-               $factory->shutdown();
+               $factory->commitMasterChanges();
+               # Output everything!
                $output->output();
+               # Do any deferred jobs
+               $this->doUpdates( $deferredUpdates );
+               $this->doJobs();
+               # Commit and close up!
+               $factory->shutdown();
                wfProfileOut( __METHOD__ );
        }
 
@@ -457,21 +460,20 @@ class MediaWiki {
                                if( !$this->getVal( 'EnableDublinCoreRdf' ) ) {
                                        wfHttpError( 403, 'Forbidden', wfMsg( 'nodublincore' ) );
                                } else {
-                                       require_once( 'includes/Metadata.php' );
-                                       wfDublinCoreRdf( $article );
+                                       $rdf = new DublinCoreRdf( $article );
+                                       $rdf->show();
                                }
                                break;
                        case 'creativecommons':
                                if( !$this->getVal( 'EnableCreativeCommonsRdf' ) ) {
                                        wfHttpError( 403, 'Forbidden', wfMsg( 'nocreativecommons' ) );
                                } else {
-                                       require_once( 'includes/Metadata.php' );
-                                       wfCreativeCommonsRdf( $article );
+                                       $rdf = new CreativeCommonsRdf( $article );
+                                       $rdf->show();
                                }
                                break;
                        case 'credits':
-                               require_once( 'includes/Credits.php' );
-                               showCreditsPage( $article );
+                               Credits::showPage( $article );
                                break;
                        case 'submit':
                                if( session_id() == '' ) {