cleanup and fixes for secondary data updates

[lhc/web/wiklou.git] / includes / Content.php

diff --git a/includes/Content.php b/includes/Content.php
index 6c23b09..490bb8c 100644 (file)
--- a/includes/Content.php
+++ b/includes/Content.php
@@ -287,6 +287,9 @@ abstract class Content {
         * Convenience method, shorthand for
         * $this->getContentHandler()->getParserOutput( $this, $title, $revId, $options, $generateHtml )
         *
+        * @note: subclasses should NOT override this to provide custom rendering.
+        *        Override ContentHandler::getParserOutput() instead!
+        *
         * @param Title $title
         * @param null $revId
         * @param null|ParserOptions $options
@@ -302,23 +305,6 @@ abstract class Content {
                return $this->getContentHandler()->getParserOutput( $this, $title, $revId, $options, $generateHtml );
        }
 
-       /**
-        * Convenience method, shorthand for
-        * $this->getContentHandler()->getSecondaryDataUpdates( $this, $title, $old, $recursive )
-        *
-        * @param Title $title the context for determining the necessary updates
-        * @param Content|null $old a Content object representing the previous content, i.e. the content being
-        *                     replaced by this Content object.
-        * @param bool $recursive whether to include recursive updates (default: false).
-        *
-        * @return Array. A list of DataUpdate objects for putting information about this content object somewhere.
-        *
-        * @since WD.1
-        */
-       public function getSecondaryDataUpdates( Title $title, Content $old = null, $recursive = false ) { #TODO: remove!
-               return $this->getContentHandler()->getSecondaryDataUpdates( $this, $title, $old, $recursive );
-       }
-
        /**
         * Construct the redirect destination from this content and return an
         * array of Titles, or null if this content doesn't represent a redirect.