Merge "Avoid calling Block::deleteIfExpired() when not needed"

[lhc/web/wiklou.git] / includes / page / Article.php

diff --git a/includes/page/Article.php b/includes/page/Article.php
index 43b1a47..af1f00b 100644 (file)
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -191,7 +191,7 @@ class Article implements Page {
        }
 
        /**
-        * Note that getContent/loadContent do not follow redirects anymore.
+        * Note that getContent does not follow redirects anymore.
         * If you need to fetch redirectable content easily, try
         * the shortcut in WikiPage::getRedirectTarget()
         *
@@ -212,7 +212,7 @@ class Article implements Page {
         * Returns a Content object representing the pages effective display content,
         * not necessarily the revision's content!
         *
-        * Note that getContent/loadContent do not follow redirects anymore.
+        * Note that getContent does not follow redirects anymore.
         * If you need to fetch redirectable content easily, try
         * the shortcut in WikiPage::getRedirectTarget()
         *
@@ -309,16 +309,6 @@ class Article implements Page {
                return $oldid;
        }
 
-       /**
-        * Load the revision (including text) into this object
-        *
-        * @deprecated since 1.19; use fetchContent()
-        */
-       function loadContent() {
-               wfDeprecated( __METHOD__, '1.19' );
-               $this->fetchContent();
-       }
-
        /**
         * Get text of an article from database
         * Does *NOT* follow redirects.
@@ -696,7 +686,7 @@ class Article implements Page {
 
                                        # Don't cache a dirty ParserOutput object
                                        if ( $poolArticleView->getIsDirty() ) {
-                                               $outputPage->setSquidMaxage( 0 );
+                                               $outputPage->setCdnMaxage( 0 );
                                                $outputPage->addHTML( "<!-- parser cache is expired, " .
                                                        "sending anyway due to pool overload-->\n" );
                                        }
@@ -2088,15 +2078,15 @@ class Article implements Page {
        /**
         * @param string $reason
         * @param bool $suppress
-        * @param int $id
-        * @param bool $commit
+        * @param int $u1 Unused
+        * @param bool $u2 Unused
         * @param string $error
         * @return bool
         */
-       public function doDeleteArticle( $reason, $suppress = false, $id = 0,
-               $commit = true, &$error = ''
+       public function doDeleteArticle(
+               $reason, $suppress = false, $u1 = null, $u2 = null, &$error = ''
        ) {
-               return $this->mPage->doDeleteArticle( $reason, $suppress, $id, $commit, $error );
+               return $this->mPage->doDeleteArticle( $reason, $suppress, $u1, $u2, $error );
        }
 
        /**