From: Matt Johnston <mattj@users.mediawiki.org>
Date: Sun, 21 Sep 2008 20:25:59 +0000 (+0000)
Subject: (Bug 15650) Limit length of displayed deletion log while creating a new page
X-Git-Tag: 1.31.0-rc.0~45156
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=c93e23140f915113683ebdac9118d84270edd2cd;p=lhc%2Fweb%2Fwiklou.git

(Bug 15650) Limit length of displayed deletion log while creating a new page
Very similair to Bug 14638 and r40944, for block form
---

diff --git a/includes/Article.php b/includes/Article.php
index eeff834474..66599f676e 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -813,7 +813,9 @@ class Article {
 			if ($this->getID() == 0) {
 				$loglist = new LogEventsList( $wgUser->getSkin(), $wgOut );
 				$pager = new LogPager( $loglist, 'delete', false, $this->mTitle->getPrefixedText() );
-				if( $pager->getNumRows() > 0 ) {
+				$count = $pager->getNumRows();
+				if( $count > 0 ) {
+					$pager->mLimit = 10;
 					$wgOut->addHtml( '<div id="mw-deleted-notice">' );
 					$wgOut->addWikiMsg( 'deleted-notice' );
 					$wgOut->addHTML(
@@ -821,6 +823,15 @@ class Article {
 						$pager->getBody() .
 						$loglist->endLogEventsList()
 					);
+					if($count > 10){
+						$wgOut->addHtml( $wgUser->getSkin()->link(
+							SpecialPage::getTitleFor( 'Log' ),
+							wfMsgHtml( 'deletelog-fulllog' ),
+							array(),
+							array(
+								'type' => 'delete',
+								'page' => $this->mTitle->getPrefixedText() ) ) );
+					}
 					$wgOut->addHtml( '</div>' );
 				}
 			}
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 65c07e99fb..dcee382458 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2340,7 +2340,9 @@ END
 		global $wgUser;
 		$loglist = new LogEventsList( $wgUser->getSkin(), $out );
 		$pager = new LogPager( $loglist, 'delete', false, $this->mTitle->getPrefixedText() );
-		if ( $pager->getNumRows() > 0 ) {
+		$count = $pager->getNumRows();
+		if ( $count > 0 ) {
+			$pager->mLimit = 10;
 			$out->addHtml( '<div id="mw-recreate-deleted-warn">' );
 			$out->addWikiMsg( 'recreate-deleted-warn' );
 			$out->addHTML(
@@ -2348,9 +2350,19 @@ END
 				$pager->getBody() .
 				$loglist->endLogEventsList()
 			);
+			if($count > 10){
+				$out->addHtml( $wgUser->getSkin()->link(
+					SpecialPage::getTitleFor( 'Log' ),
+					wfMsgHtml( 'deletelog-fulllog' ),
+					array(),
+					array(
+						'type' => 'delete',
+						'page' => $this->mTitle->getPrefixedText() ) ) );
+			}
 			$out->addHtml( '</div>' );
 			return true;
 		}
+		
 		return false;
 	}
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 84afac3f53..6024a74fec 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1186,6 +1186,7 @@ You should consider whether it is appropriate to continue editing this page.
 The deletion log for this page is provided here for convenience:",
 'deleted-notice'                   => 'This page has been deleted.
 The deletion log for the page is provided below for reference.',
+'deletelog-fulllog'                => 'View full log',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Warning: This page contains too many expensive parser function calls.