X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryTags.php;h=ed5fe8a5c3958bac14be2a90dd92444361a0299d;hb=8de958444f1d36ecb95d3a53d96cc1404e95468e;hp=be67dd249b196fcde918753be77e82f3260d9c3f;hpb=d42d6bd868fd5b579080639995e6a7e23851fcf3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryTags.php b/includes/api/ApiQueryTags.php
index be67dd249b..ed5fe8a5c3 100644
--- a/includes/api/ApiQueryTags.php
+++ b/includes/api/ApiQueryTags.php
@@ -1,9 +1,5 @@
 <?php
 /**
- *
- *
- * Created on Jul 9, 2009
- *
  * Copyright © 2009
  *
  * This program is free software; you can redistribute it and/or modify
@@ -53,37 +49,24 @@ class ApiQueryTags extends ApiQueryBase {
 		$softwareDefinedTags = array_fill_keys( ChangeTags::listSoftwareDefinedTags(), 0 );
 		$explicitlyDefinedTags = array_fill_keys( ChangeTags::listExplicitlyDefinedTags(), 0 );
 		$softwareActivatedTags = array_fill_keys( ChangeTags::listSoftwareActivatedTags(), 0 );
+		$tagStats = ChangeTags::tagUsageStatistics();
 
-		$definedTags = array_merge( $softwareDefinedTags, $explicitlyDefinedTags );
+		$tagHitcounts = array_merge( $softwareDefinedTags, $explicitlyDefinedTags, $tagStats );
+		$tags = array_keys( $tagHitcounts );
 
 		# Fetch defined tags that aren't past the continuation
 		if ( $params['continue'] !== null ) {
 			$cont = $params['continue'];
-			$tags = array_filter( array_keys( $definedTags ), function ( $v ) use ( $cont ) {
+			$tags = array_filter( $tags, function ( $v ) use ( $cont ) {
 				return $v >= $cont;
 			} );
-			$tags = array_fill_keys( $tags, 0 );
-		} else {
-			$tags = $definedTags;
-		}
-
-		# Merge in all used tags
-		$this->addTables( 'change_tag' );
-		$this->addFields( 'ct_tag' );
-		$this->addFields( [ 'hitcount' => $fld_hitcount ? 'COUNT(*)' : '0' ] );
-		$this->addOption( 'LIMIT', $limit + 1 );
-		$this->addOption( 'GROUP BY', 'ct_tag' );
-		$this->addWhereRange( 'ct_tag', 'newer', $params['continue'], null );
-		$res = $this->select( __METHOD__ );
-		foreach ( $res as $row ) {
-			$tags[$row->ct_tag] = (int)$row->hitcount;
 		}
 
 		# Now make sure the array is sorted for proper continuation
-		ksort( $tags );
+		sort( $tags );
 
 		$count = 0;
-		foreach ( $tags as $tagName => $hitcount ) {
+		foreach ( $tags as $tagName ) {
 			if ( ++$count > $limit ) {
 				$this->setContinueEnumParameter( 'continue', $tagName );
 				break;
@@ -102,7 +85,7 @@ class ApiQueryTags extends ApiQueryBase {
 			}
 
 			if ( $fld_hitcount ) {
-				$tag['hitcount'] = $hitcount;
+				$tag['hitcount'] = intval( $tagHitcounts[$tagName] );
 			}
 
 			$isSoftware = isset( $softwareDefinedTags[$tagName] );
@@ -154,9 +137,8 @@ class ApiQueryTags extends ApiQueryBase {
 				ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2
 			],
 			'prop' => [
-				ApiBase::PARAM_DFLT => 'name',
+				ApiBase::PARAM_DFLT => '',
 				ApiBase::PARAM_TYPE => [
-					'name',
 					'displayname',
 					'description',
 					'hitcount',