http://www.mediawiki.org/wiki/Special:Code/MediaWiki/69125

Revision: 69125
Author:   tstarling
Date:     2010-07-07 01:08:01 +0000 (Wed, 07 Jul 2010)

Log Message:
-----------
MFT r68232: disable $wgHitcounterUpdateFreq on SQLite

Modified Paths:
--------------
    branches/REL1_16/phase3/RELEASE-NOTES
    branches/REL1_16/phase3/includes/Article.php

Property Changed:
----------------
    branches/REL1_16/phase3/includes/Article.php

Modified: branches/REL1_16/phase3/RELEASE-NOTES
===================================================================
--- branches/REL1_16/phase3/RELEASE-NOTES       2010-07-07 00:28:37 UTC (rev 
69124)
+++ branches/REL1_16/phase3/RELEASE-NOTES       2010-07-07 01:08:01 UTC (rev 
69125)
@@ -56,6 +56,7 @@
 * Fixed plural function for Northern Sami (se)
 * (bug 23597) Fixed conflicts between ID attributes in the Vector skin and 
   parser-generated heading IDs. Renamed head, panel, head-base and page-base.
+* Disabled $wgHitcounterUpdateFreq>1 feature on SQLite, does not work yet.
 
 == Changes since 1.16 beta 2 ==
 

Modified: branches/REL1_16/phase3/includes/Article.php
===================================================================
--- branches/REL1_16/phase3/includes/Article.php        2010-07-07 00:28:37 UTC 
(rev 69124)
+++ branches/REL1_16/phase3/includes/Article.php        2010-07-07 01:08:01 UTC 
(rev 69125)
@@ -3661,8 +3661,9 @@
                $pageTable = $dbw->tableName( 'page' );
                $hitcounterTable = $dbw->tableName( 'hitcounter' );
                $acchitsTable = $dbw->tableName( 'acchits' );
+               $dbType = $dbw->getType();
 
-               if ( $wgHitcounterUpdateFreq <= 1 ) {
+               if ( $wgHitcounterUpdateFreq <= 1 || $dbType == 'sqlite' ) {
                        $dbw->query( "UPDATE $pageTable SET page_counter = 
page_counter + 1 WHERE page_id = $id" );
                        return;
                }
@@ -3686,7 +3687,6 @@
                        wfProfileIn( 'Article::incViewCount-collect' );
                        $old_user_abort = ignore_user_abort( true );
 
-                       $dbType = $dbw->getType();
                        $dbw->lockTables( array(), array( 'hitcounter' ), 
__METHOD__, false );
                        $tabletype = $dbType == 'mysql' ? "ENGINE=HEAP " : '';
                        $dbw->query( "CREATE TEMPORARY TABLE $acchitsTable 
$tabletype AS " .


Property changes on: branches/REL1_16/phase3/includes/Article.php
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/REL1_15/phase3/includes/Article.php:51646
/branches/sqlite/includes/Article.php:58211-58321
/branches/wmf-deployment/includes/Article.php:53381
/trunk/phase3/includes/Article.php:63549,63764,63897-63901,64918,64934,64948
   + /branches/REL1_15/phase3/includes/Article.php:51646
/branches/sqlite/includes/Article.php:58211-58321
/branches/wmf-deployment/includes/Article.php:53381
/trunk/phase3/includes/Article.php:63549,63764,63897-63901,64918,64934,64948,68232



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to