* Fix #6823: HTML dumping should not increment the page view counters.

* Small documentation for $wgDisableCounters.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b6a22b5..f07f624 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -51,7 +51,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 == Maintenance script changes since 1.10 ==
 
 * Add support for wgMaxTocLevel option in parserTests
-
+* (bug 6823) dumpHTML: explicitly disable article view counter
 
 == Languages updated since 1.10 ==
 

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 677717e..dce78a8 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1337,7 +1337,11 @@ $wgDebugFunctionEntry = 0;
 /** Lots of debugging output from SquidUpdate.php */
 $wgDebugSquid = false;
 
+/** Whereas to count the number of time an article is viewed.
+ * Does not work if pages are cached (for example with squid).
+ */
 $wgDisableCounters = false;
+
 $wgDisableTextSearch = false;
 $wgDisableSearchContext = false;
 /**

diff --git a/maintenance/dumpHTML.inc b/maintenance/dumpHTML.inc
index ca2a7df..18f5a9d 100644 (file)
--- a/maintenance/dumpHTML.inc
+++ b/maintenance/dumpHTML.inc
@@ -9,6 +9,10 @@ require_once( 'includes/ImagePage.php' );
 require_once( 'includes/CategoryPage.php' );
 require_once( 'includes/RawPage.php' );
 
+# Explicitly disable article view counter (bug 6823)
+global $wgDisableCounters;
+$wgDisableCounters = true;
+
 class DumpHTML {
        # Destination directory
        var $dest;