X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSiteStats.php;h=32c6761372f6eab961172035dcb5ea66e901ae8e;hb=0138ee519c972005d12c517bb3e29130fcdfa3ce;hp=4e737d136e3bba5fd1f6e94f27f18816d72db31a;hpb=2e50b896f1a55667ced32502caa9681c36df7587;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SiteStats.php b/includes/SiteStats.php
index 4e737d136e..32c6761372 100644
--- a/includes/SiteStats.php
+++ b/includes/SiteStats.php
@@ -102,7 +102,6 @@ class SiteStats {
 	static function doLoad( $db ) {
 		return $db->selectRow( 'site_stats', array(
 				'ss_row_id',
-				'ss_total_views',
 				'ss_total_edits',
 				'ss_good_articles',
 				'ss_total_pages',
@@ -113,11 +112,16 @@ class SiteStats {
 	}
 
 	/**
+	 * Return the total number of page views. Except we don't track those anymore.
+	 * Stop calling this function, it will be removed some time in the future. It's
+	 * kept here simply to prevent fatal errors.
+	 *
+	 * @deprecated since 1.25
 	 * @return int
 	 */
 	static function views() {
-		self::load();
-		return self::$row->ss_total_views;
+		wfDeprecated( __METHOD__, '1.25' );
+		return 0;
 	}
 
 	/**
@@ -170,7 +174,7 @@ class SiteStats {
 
 	/**
 	 * Find the number of users in a given user group.
-	 * @param string $group name of group
+	 * @param string $group Name of group
 	 * @return int
 	 */
 	static function numberingroup( $group ) {
@@ -249,7 +253,6 @@ class SiteStats {
 		}
 		// Now check for underflow/overflow
 		foreach ( array(
-			'ss_total_views',
 			'ss_total_edits',
 			'ss_good_articles',
 			'ss_total_pages',
@@ -273,7 +276,8 @@ class SiteStatsInit {
 	private $db;
 
 	// Various stats
-	private $mEdits, $mArticles, $mPages, $mUsers, $mViews, $mFiles = 0;
+	private $mEdits = null, $mArticles = null, $mPages = null;
+	private $mUsers = null, $mFiles = null;
 
 	/**
 	 * Constructor
@@ -347,15 +351,6 @@ class SiteStatsInit {
 		return $this->mUsers;
 	}
 
-	/**
-	 * Count views
-	 * @return int
-	 */
-	public function views() {
-		$this->mViews = $this->db->selectField( 'page', 'SUM(page_counter)', '', __METHOD__ );
-		return $this->mViews;
-	}
-
 	/**
 	 * Count total files
 	 * @return int
@@ -372,12 +367,11 @@ class SiteStatsInit {
 	 * @param DatabaseBase|bool $database
 	 * - Boolean: whether to use the master DB
 	 * - DatabaseBase: database connection to use
-	 * @param array $options of options, may contain the following values
-	 * - views Boolean: when true, do not update the number of page views (default: true)
+	 * @param array $options Array of options, may contain the following values
 	 * - activeUsers Boolean: whether to update the number of active users (default: false)
 	 */
 	public static function doAllAndCommit( $database, array $options = array() ) {
-		$options += array( 'update' => false, 'views' => true, 'activeUsers' => false );
+		$options += array( 'update' => false, 'activeUsers' => false );
 
 		// Grab the object and count everything
 		$counter = new SiteStatsInit( $database );
@@ -388,11 +382,6 @@ class SiteStatsInit {
 		$counter->users();
 		$counter->files();
 
-		// Only do views if we don't want to not count them
-		if ( $options['views'] ) {
-			$counter->views();
-		}
-
 		$counter->refresh();
 
 		// Count active users if need be
@@ -402,18 +391,16 @@ class SiteStatsInit {
 	}
 
 	/**
-	 * Refresh site_stats.
+	 * Refresh site_stats
 	 */
-	protected function refresh() {
+	public function refresh() {
 		$values = array(
 			'ss_row_id' => 1,
-			'ss_total_edits' => $this->mEdits,
-			'ss_good_articles' => $this->mArticles,
-			'ss_total_pages' => $this->mPages,
-			'ss_users' => $this->mUsers,
-			'ss_images' => $this->mFiles,
-		) + (
-			$this->mViews ? array( 'ss_total_views' => $this->mViews ) : array()
+			'ss_total_edits' => ( $this->mEdits === null ? $this->edits() : $this->mEdits ),
+			'ss_good_articles' => ( $this->mArticles === null ? $this->articles() : $this->mArticles ),
+			'ss_total_pages' => ( $this->mPages === null ? $this->pages() : $this->mPages ),
+			'ss_users' => ( $this->mUsers === null ? $this->users() : $this->mUsers ),
+			'ss_images' => ( $this->mFiles === null ? $this->files() : $this->mFiles ),
 		);
 
 		$dbw = wfGetDB( DB_MASTER );