From: daniel <daniel.kinzler@wikimedia.de>
Date: Tue, 15 May 2012 06:46:34 +0000 (+0200)
Subject: merged master after 1.20wmf3
X-Git-Tag: 1.31.0-rc.0~22097^2^2~170
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=181641792a275e6b7a8bca24393d683e578fadca;p=lhc%2Fweb%2Fwiklou.git

merged master after 1.20wmf3
---

181641792a275e6b7a8bca24393d683e578fadca
diff --cc includes/LinksUpdate.php
index d6fd4fb969,8b403fcd85..56595cacc5
--- a/includes/LinksUpdate.php
+++ b/includes/LinksUpdate.php
@@@ -40,8 -39,9 +39,7 @@@ class LinksUpdate extends SqlDataUpdat
  		$mCategories,    //!< Map of category names to sort keys
  		$mInterlangs,    //!< Map of language codes to titles
  		$mProperties,    //!< Map of arbitrary name to value
 -		$mDb,            //!< Database connection reference
 -		$mOptions,       //!< SELECT options to be used (array)
  		$mRecursive;     //!< Whether to queue jobs for recursive updates
- 	/**@}}*/
  
  	/**
  	 * Constructor
diff --cc includes/api/ApiPurge.php
index c01af27601,8ef9cbc0e3..8c5e8df651
--- a/includes/api/ApiPurge.php
+++ b/includes/api/ApiPurge.php
@@@ -91,11 -91,11 +91,11 @@@ class ApiPurge extends ApiBase 
  					$popts = ParserOptions::newFromContext( $this->getContext() );
  					$popts->setTidy( true );
  					$p_result = $wgParser->parse( $page->getRawText(), $title, $popts,
 -						true, true, $page->getLatest() );
 +						true, true, $page->getLatest() ); #FIXME: content!
  
  					# Update the links tables
-                     $updates = $p_result->getSecondaryDataUpdates( $title );
-                     SecondaryDataUpdate::runUpdates( $updates );
+ 					$updates = $p_result->getSecondaryDataUpdates( $title );
+ 					DataUpdate::runUpdates( $updates );
  
  					$r['linkupdate'] = '';
  
diff --cc includes/parser/ParserOutput.php
index d0d1ff2eb6,d929f1a532..5fbc99d0f9
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@@ -155,27 -155,9 +155,15 @@@ class ParserOutput extends CacheTime 
  		$mProperties = array(),       # Name/value pairs to be cached in the DB
  		$mTOCHTML = '',               # HTML of the TOC
  		$mTimestamp;                  # Timestamp of the revision
+ 		private $mIndexPolicy = '';       # 'index' or 'noindex'?  Any other value will result in no change.
+ 		private $mAccessedOptions = array(); # List of ParserOptions (stored in the keys)
 -		private $mSecondaryDataUpdates = array(); # List of instances of SecondaryDataObject(), used to cause some information extracted from the page in a custom place.
 +
 +	/**
- 	 * 'index' or 'noindex'?  Any other value will result in no change.
- 	 * 
- 	 * @var string
- 	 */
- 	protected $mIndexPolicy = '';
- 
- 	/**
- 	 * List of ParserOptions (stored in the keys)
- 	 *
- 	 * @var array
- 	 */
- 	protected $mAccessedOptions = array();
- 
- 	/**
- 	 * List of instances of SecondaryDataObject(), used to cause some information extracted from the page in a custom place.
++	 * List of instances of DataUpdate(), used to cause some information extracted from the page in a custom place.
 +	 * @since WD.1
- 	 * @var array of SecondaryDataObject
++	 * @var array of DataUpdate
 +	 */
 +	protected $mSecondaryDataUpdates = array();
  
  	const EDITSECTION_REGEX = '#<(?:mw:)?editsection page="(.*?)" section="(.*?)"(?:/>|>(.*?)(</(?:mw:)?editsection>))#';