Merge "(bug 17808) (bug 21167) use real links for search suggestions"

[lhc/web/wiklou.git] / maintenance / rebuildFileCache.php

diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php
index 441310d..3165b97 100644 (file)
--- a/maintenance/rebuildFileCache.php
+++ b/maintenance/rebuildFileCache.php
@@ -17,11 +17,17 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
+/**
+ * Maintenance script that builds file cache for content pages.
+ *
+ * @ingroup Maintenance
+ */
 class RebuildFileCache extends Maintenance {
        public function __construct() {
                parent::__construct();
@@ -32,15 +38,21 @@ class RebuildFileCache extends Maintenance {
                $this->setBatchSize( 100 );
        }
 
+       public function finalSetup() {
+               global $wgDebugToolbar;
+
+               // Debug toolbar makes content uncacheable so we disable it.
+               // Has to be done before Setup.php initialize MWDebug
+               $wgDebugToolbar = false;
+               parent::finalSetup();
+       }
+
        public function execute() {
                global $wgUseFileCache, $wgReadOnly, $wgContentNamespaces, $wgRequestTime;
-               global $wgDebugToolbar;
                global $wgTitle, $wgOut;
                if ( !$wgUseFileCache ) {
                        $this->error( "Nothing to do -- \$wgUseFileCache is disabled.", true );
                }
-               // Debug toolbar makes content uncacheable
-               $wgDebugToolbar = false;
 
                $wgReadOnly = 'Building cache'; // avoid DB writes (like enotif/counters)
 
@@ -87,11 +99,11 @@ class RebuildFileCache extends Maintenance {
                                array( 'ORDER BY' => 'page_id ASC', 'USE INDEX' => 'PRIMARY' )
                        );
 
-                       $dbw->begin(); // for any changes
+                       $dbw->begin( __METHOD__ ); // for any changes
                        foreach ( $res as $row ) {
                                $rebuilt = false;
                                $wgRequestTime = microtime( true ); # bug 22852
-                               
+
                                $wgTitle = Title::makeTitleSafe( $row->page_namespace, $row->page_title );
                                if ( null == $wgTitle ) {
                                        $this->output( "Page {$row->page_id} has bad title\n" );
@@ -133,7 +145,7 @@ class RebuildFileCache extends Maintenance {
                                        $this->output( "Page {$row->page_id} not cacheable\n" );
                                }
                        }
-                       $dbw->commit(); // commit any changes (just for sanity)
+                       $dbw->commit( __METHOD__ ); // commit any changes (just for sanity)
 
                        $blockStart += $this->mBatchSize;
                        $blockEnd += $this->mBatchSize;