Index: branches/REL1_16/phase3/includes/Article.php |
— | — | @@ -3661,8 +3661,9 @@ |
3662 | 3662 | $pageTable = $dbw->tableName( 'page' ); |
3663 | 3663 | $hitcounterTable = $dbw->tableName( 'hitcounter' ); |
3664 | 3664 | $acchitsTable = $dbw->tableName( 'acchits' ); |
| 3665 | + $dbType = $dbw->getType(); |
3665 | 3666 | |
3666 | | - if ( $wgHitcounterUpdateFreq <= 1 ) { |
| 3667 | + if ( $wgHitcounterUpdateFreq <= 1 || $dbType == 'sqlite' ) { |
3667 | 3668 | $dbw->query( "UPDATE $pageTable SET page_counter = page_counter + 1 WHERE page_id = $id" ); |
3668 | 3669 | return; |
3669 | 3670 | } |
— | — | @@ -3686,7 +3687,6 @@ |
3687 | 3688 | wfProfileIn( 'Article::incViewCount-collect' ); |
3688 | 3689 | $old_user_abort = ignore_user_abort( true ); |
3689 | 3690 | |
3690 | | - $dbType = $dbw->getType(); |
3691 | 3691 | $dbw->lockTables( array(), array( 'hitcounter' ), __METHOD__, false ); |
3692 | 3692 | $tabletype = $dbType == 'mysql' ? "ENGINE=HEAP " : ''; |
3693 | 3693 | $dbw->query( "CREATE TEMPORARY TABLE $acchitsTable $tabletype AS " . |
Property changes on: branches/REL1_16/phase3/includes/Article.php |
___________________________________________________________________ |
Modified: svn:mergeinfo |
3694 | 3694 | Merged /trunk/phase3/includes/Article.php:r68232 |
Index: branches/REL1_16/phase3/RELEASE-NOTES |
— | — | @@ -56,6 +56,7 @@ |
57 | 57 | * Fixed plural function for Northern Sami (se) |
58 | 58 | * (bug 23597) Fixed conflicts between ID attributes in the Vector skin and |
59 | 59 | parser-generated heading IDs. Renamed head, panel, head-base and page-base. |
| 60 | +* Disabled $wgHitcounterUpdateFreq>1 feature on SQLite, does not work yet. |
60 | 61 | |
61 | 62 | == Changes since 1.16 beta 2 == |
62 | 63 | |