merged master after 1.20wmf3

diff --cc docs/hooks.txt
Simple merge

diff --cc includes/AutoLoader.php
Simple merge

diff --cc includes/DefaultSettings.php
Simple merge

diff --cc includes/Export.php
Simple merge

diff --cc includes/FeedUtils.php
Simple merge

diff --cc includes/LinksUpdate.php
index d6fd4fb,8b403fc..56595ca
--- 1/includes/LinksUpdate.php
--- 2/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/Namespace.php
Simple merge

diff --cc includes/WikiPage.php
Simple merge

diff --cc includes/api/ApiPurge.php
index c01af27,8ef9cbc..8c5e8df
--- 1/includes/api/ApiPurge.php
--- 2/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 d0d1ff2,d929f1a..5fbc99d
--- 1/includes/parser/ParserOutput.php
--- 2/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 $mSecondaryDataUpdates = array(); # List of instances of SecondaryDataObject(), used to cause some information extracted from the page in a custom place.
+               private $mIndexPolicy = '';       # 'index' or 'noindex'?  Any other value will result in no change.
+               private $mAccessedOptions = array(); # List of ParserOptions (stored in the keys)
-        * '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.
 +
 +      /**
-        * @var array of SecondaryDataObject
++       * List of instances of DataUpdate(), used to cause some information extracted from the page in a custom place.
 +       * @since WD.1
++       * @var array of DataUpdate
 +       */
 +      protected $mSecondaryDataUpdates = array();
  
        const EDITSECTION_REGEX = '#<(?:mw:)?editsection page="(.*?)" section="(.*?)"(?:/>|>(.*?)(</(?:mw:)?editsection>))#';
  

diff --cc includes/specials/SpecialUndelete.php
Simple merge