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 4a8d7bb..eea2570 100644 (file)
--- 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 b4ef062..afd6880 100644 (file)
--- 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 );
        }
 
        /**