From 57b3d9fedbaee4e06fe658fcf2e14850efcd772a Mon Sep 17 00:00:00 2001 From: Erik Moeller Date: Mon, 9 Jun 2003 01:46:22 +0000 Subject: [PATCH] bugfixes to deletion code --- includes/Article.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/Article.php b/includes/Article.php index 1ca8cf5f94..bc7847ee11 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -1020,7 +1020,7 @@ name=\"wpSummary\" maxlength=200 size=60>
# we select the text because it might be useful below $sql="SELECT old_text FROM old WHERE old_namespace=0 and old_title='" . wfStrencode($wgTitle->getPrefixedDBkey())."' ORDER BY inverse_timestamp LIMIT 1"; $res=wfQuery($sql,$fname); - if( $old=wfFetchObject($res)) { + if( ($old=wfFetchObject($res)) && !$wpConfirm ) { $skin=$wgUser->getSkin(); $wgOut->addHTML("".wfMsg("historywarning")); $wgOut->addHTML( $skin->historyLink() ."

"); @@ -1047,10 +1047,10 @@ name=\"wpSummary\" maxlength=200 size=60>
# this should not happen, since it is not possible to store an empty, new # page. Let's insert a standard text in case it does, though - if($length==0) { $wpreason=wfmsg("exblank");} + if($length==0 && !$wpReason) { $wpReason=wfmsg("exblank");} - if($length < 500) { + if($length < 500 && !$wpReason) { # comment field=255, let's grep the first 150 to have some user # space left -- 2.20.1