X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiPurge.php;h=981dc18f030f72005a29ab9cf602de93a22e6e79;hb=af2c2b6331842bc9e66d5cdda27291de585c8ea5;hp=c0dd8088633f3073e36570848de308c05446ebdd;hpb=5df5a5b4a8ce61cda82af3c636a9b1f3016e6464;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiPurge.php b/includes/api/ApiPurge.php
index c0dd808863..981dc18f03 100644
--- a/includes/api/ApiPurge.php
+++ b/includes/api/ApiPurge.php
@@ -32,30 +32,6 @@
 class ApiPurge extends ApiBase {
 	private $mPageSet;
 
-	/**
-	 * Add all items from $values into the result
-	 * @param array $result output
-	 * @param array $values values to add
-	 * @param string $flag the name of the boolean flag to mark this element
-	 * @param string $name if given, name of the value
-	 */
-	private static function addValues( array &$result, $values, $flag = null, $name = null ) {
-		foreach ( $values as $val ) {
-			if ( $val instanceof Title ) {
-				$v = array();
-				ApiQueryBase::addTitleInfo( $v, $val );
-			} elseif ( $name !== null ) {
-				$v = array( $name => $val );
-			} else {
-				$v = $val;
-			}
-			if ( $flag !== null ) {
-				$v[$flag] = '';
-			}
-			$result[] = $v;
-		}
-	}
-
 	/**
 	 * Purges the cache of a page
 	 */
@@ -67,13 +43,7 @@ class ApiPurge extends ApiBase {
 		$pageSet = $this->getPageSet();
 		$pageSet->execute();
 
-		$result = array();
-		self::addValues( $result, $pageSet->getInvalidTitles(), 'invalid', 'title' );
-		self::addValues( $result, $pageSet->getSpecialTitles(), 'special', 'title' );
-		self::addValues( $result, $pageSet->getMissingPageIDs(), 'missing', 'pageid' );
-		self::addValues( $result, $pageSet->getMissingRevisionIDs(), 'missing', 'revid' );
-		self::addValues( $result, $pageSet->getMissingTitles(), 'missing' );
-		self::addValues( $result, $pageSet->getInterwikiTitlesAsResult() );
+		$result = $pageSet->getInvalidTitlesAndRevisions();
 
 		foreach ( $pageSet->getGoodTitles() as $title ) {
 			$r = array();
@@ -84,17 +54,16 @@ class ApiPurge extends ApiBase {
 
 			if ( $forceLinkUpdate || $forceRecursiveLinkUpdate ) {
 				if ( !$this->getUser()->pingLimiter( 'linkpurge' ) ) {
-					global $wgEnableParserCache;
-
 					$popts = $page->makeParserOptions( 'canonical' );
 
 					# Parse content; note that HTML generation is only needed if we want to cache the result.
 					$content = $page->getContent( Revision::RAW );
+					$enableParserCache = $this->getConfig()->get( 'EnableParserCache' );
 					$p_result = $content->getParserOutput(
 						$title,
 						$page->getLatest(),
 						$popts,
-						$wgEnableParserCache
+						$enableParserCache
 					);
 
 					# Update the links tables
@@ -104,7 +73,7 @@ class ApiPurge extends ApiBase {
 
 					$r['linkupdate'] = '';
 
-					if ( $wgEnableParserCache ) {
+					if ( $enableParserCache ) {
 						$pcache = ParserCache::singleton();
 						$pcache->save( $p_result, $page, $popts );
 					}