X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSiteStats.php;h=01841b67db88880f39887d8de8b898c700a7c737;hb=4b5f75205bfb984cee46a15b9d52c1ec0f27af21;hp=1c2c454d0d68d5f8cd50965836f59fa8ea74be63;hpb=001152e597390a45bffb9a60bf7ff4cd4009be88;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SiteStats.php b/includes/SiteStats.php
index 1c2c454d0d..01841b67db 100644
--- a/includes/SiteStats.php
+++ b/includes/SiteStats.php
@@ -48,8 +48,7 @@ class SiteStats {
 			# Update schema
 			$u = new SiteStatsUpdate( 0, 0, 0 );
 			$u->doUpdate();
-			$dbr = wfGetDB( DB_SLAVE );
-			self::$row = $dbr->selectRow( 'site_stats', '*', false, __METHOD__ );
+			self::$row = self::doLoad( wfGetDB( DB_SLAVE ) );
 		}
 
 		self::$loaded = true;
@@ -91,7 +90,16 @@ class SiteStats {
 	 * @return Bool|ResultWrapper
 	 */
 	static function doLoad( $db ) {
-		return $db->selectRow( 'site_stats', '*', false, __METHOD__ );
+		return $db->selectRow( 'site_stats', array(
+				'ss_row_id',
+				'ss_total_views',
+				'ss_total_edits',
+				'ss_good_articles',
+				'ss_total_pages',
+				'ss_users',
+				'ss_active_users',
+				'ss_images',
+			), false, __METHOD__ );
 	}
 
 	/**
@@ -286,6 +294,8 @@ class SiteStatsUpdate implements DeferrableUpdate {
 			$this->doUpdatePendingDeltas();
 		} else {
 			$dbw = wfGetDB( DB_MASTER );
+			// Need a separate transaction because this a global lock
+			$dbw->begin( __METHOD__ );
 
 			$lockKey = wfMemcKey( 'site_stats' ); // prepend wiki ID
 			if ( $rate ) {
@@ -306,9 +316,6 @@ class SiteStatsUpdate implements DeferrableUpdate {
 				$this->images   += ( $pd['ss_images']['+'] - $pd['ss_images']['-'] );
 			}
 
-			// Need a separate transaction because this a global lock
-			$dbw->begin( __METHOD__ );
-
 			// Build up an SQL query of deltas and apply them...
 			$updates = '';
 			$this->appendUpdate( $updates, 'ss_total_views', $this->views );