From: daniel <daniel.kinzler@wikimedia.de>
Date: Thu, 24 May 2012 10:01:19 +0000 (+0200)
Subject: B/C: making Article::getchContent public again
X-Git-Tag: 1.31.0-rc.0~22097^2^2~157
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=a4d4c7cc419a08ee5fa69c61a060e8f5a81f1d15;p=lhc%2Fweb%2Fwiklou.git

B/C: making Article::getchContent public again
---

diff --git a/includes/Article.php b/includes/Article.php
index 57ccab2397..5bfc7712e8 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -325,10 +325,15 @@ class Article extends Page {
 	 * Get text of an article from database
 	 * Does *NOT* follow redirects.
 	 *
+	 * @protected
+	 * @note this is really internal functionality that should really NOT be used by other functions. For accessing
+	 *       article content, use the WikiPage class, especially WikiBase::getContent(). However, a lot of legacy code
+	 *       uses this method to retrieve page text from the database, so the function has to remain public for now.
+	 *
 	 * @return mixed string containing article contents, or false if null
-	 * @deprecated in 1.WD, use getContentObject() instead
+	 * @deprecated in 1.WD, use WikiPage::getContent() instead
 	 */
-	protected function fetchContent() { #BC cruft!
+	function fetchContent() { #BC cruft!
 		wfDeprecated( __METHOD__, '1.WD' );
 
 		if ( $this->mContentLoaded && $this->mContent ) {
@@ -353,6 +358,8 @@ class Article extends Page {
 	 * Does *NOT* follow redirects.
 	 * TODO: when is this null?
 	 *
+	 * @note code that wants to retrieve page content from the database should use WikiPage::getContent().
+	 *
 	 * @return Content|null
 	 *
 	 * @since 1.WD