Bug fixes

diff --git a/includes/Article.php b/includes/Article.php
index 2a126e4..c52ae3f 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1022,6 +1022,11 @@ $wgLang->recodeForEdit( $wpTextbox1 ) .
                        return;
                }
 
+               if ( $wpConfirm ) {
+                       $this->doDelete();
+                       return;
+               }
+
                # determine whether this page has earlier revisions
                # and insert a warning if it does
                # we select the text because it might be useful below
@@ -1083,6 +1088,8 @@ $wgLang->recodeForEdit( $wpTextbox1 ) .
        function confirmDelete( $par = "" )
        {
                global $wgOut;
+
+               wfDebug( "Article::confirmDelete\n" );
                
                $sub = htmlspecialchars( $this->mTitle->getPrefixedText() );
                $wgOut->setSubtitle( wfMsg( "deletesub", $sub ) );
@@ -1117,6 +1124,7 @@ $wgLang->recodeForEdit( $wpTextbox1 ) .
                global $wgOut, $wgUser, $wgLang;
                global $wpReason;
                $fname = "Article::doDelete";
+               wfDebug( "$fname\n" );
 
                $this->doDeleteArticle( $this->mTitle );
                $deleted = $this->mTitle->getPrefixedText();
@@ -1141,6 +1149,8 @@ $wgLang->recodeForEdit( $wpTextbox1 ) .
                global $wgUser, $wgOut, $wgLang, $wpReason, $wgDeferredUpdateList;
 
                $fname = "Article::doDeleteArticle";
+               wfDebug( "$fname\n" );
+
                $ns = $title->getNamespace();
                $t = wfStrencode( $title->getDBkey() );
                $id = $title->getArticleID();

diff --git a/includes/SpecialUndelete.php b/includes/SpecialUndelete.php
index ba5fce1..0a339a8 100644 (file)
--- a/includes/SpecialUndelete.php
+++ b/includes/SpecialUndelete.php
@@ -173,7 +173,7 @@ function wfSpecialUndelete( $par )
                $log = new LogPage( wfMsg( "dellogpage" ), wfMsg( "dellogpagetext" ) );
                $log->addEntry( wfMsg( "undeletedarticle", $target ), "" );
 
-               $wgout->addwikitext(str_replace("$1", $target, wfmsg("undeletedtext")));
+               $wgOut->addwikitext(str_replace("$1", $target, wfmsg("undeletedtext")));
                return 0;
        }
 ?>