From: daniel <daniel.kinzler@wikimedia.de>
Date: Wed, 6 Jun 2012 12:06:22 +0000 (+0200)
Subject: fixing getAutoDeleteReason:
X-Git-Tag: 1.31.0-rc.0~22097^2^2~148
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=ea8032b078c18bd9fa93899513acfde3e4731116;p=lhc%2Fweb%2Fwiklou.git

fixing getAutoDeleteReason:

* load text of previous revision, not current in ContentHandler::getAutoDeleteReason()
* actually return the result from WikiPage::getAutoDeleteReason()
---

diff --git a/includes/ContentHandler.php b/includes/ContentHandler.php
index 4a8d7bb41f..eea2570ee4 100644
--- a/includes/ContentHandler.php
+++ b/includes/ContentHandler.php
@@ -648,7 +648,7 @@ abstract class ContentHandler {
 			$prev = $rev->getPrevious();
 
 			if ( $prev )	{
-				$content = $rev->getContent();
+				$content = $prev->getContent();
 				$blank = true;
 			}
 		}
diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index b4ef062de3..afd6880cbf 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -2871,8 +2871,7 @@ class WikiPage extends Page {
 		wfDeprecated( __METHOD__, '1.WD' );
 
 		$handler = ContentHandler::getForTitle( $this->getTitle() );
-		$handler->getAutoDeleteReason( $this->getTitle(), $hasHistory );
-		#crap deleted
+		return $handler->getAutoDeleteReason( $this->getTitle(), $hasHistory );
 	}
 
 	/**