Don't override the default Bitmap.php information in the longDescription() for GIF...

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

diff --git a/includes/Article.php b/includes/Article.php
index c28275e..862a81b 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -458,7 +458,7 @@ class Article {
                $lc = LinkCache::singleton();
 
                if ( $data ) {
-                       $lc->addGoodLinkObj( $data->page_id, $this->mTitle, $data->page_len, $data->page_is_redirect );
+                       $lc->addGoodLinkObj( $data->page_id, $this->mTitle, $data->page_len, $data->page_is_redirect, $data->page_latest );
 
                        $this->mTitle->mArticleID = intval( $data->page_id );
 
@@ -2043,6 +2043,7 @@ class Article {
         * @param $baseRevId the revision ID this edit was based off, if any
         * @param $user Optional user object, $wgUser will be used if not passed
         * @param $watchthis Watch the page if true, unwatch the page if false, do nothing if null
+        * @param $comment Boolean: whether the edit is a new section
         * @param $sectionanchor The section anchor for the page; used for redirecting the user back to the page
         *              after the edit is successfully committed
         * @param $redirect If true, redirect the user back to the page after the edit is successfully committed
@@ -4047,8 +4048,9 @@ class Article {
                $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;
@@ -4075,7 +4077,6 @@ class Article {
                        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 " .