From e67f0cf63c570ab91b4a07e7b4c94adbe5b574df Mon Sep 17 00:00:00 2001
From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Mon, 16 Jul 2007 15:15:26 +0000
Subject: [PATCH] * Add a message if category is empty

---
 RELEASE-NOTES                     |  1 +
 includes/CategoryPage.php         | 11 +++++++++--
 languages/messages/MessagesDe.php |  1 +
 languages/messages/MessagesEn.php |  1 +
 maintenance/language/messages.inc |  1 +
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6ef808cd64..9a211943b0 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -142,6 +142,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   compatibility
 * Introduced 'ContributionsToolLinks' hook; see docs/hooks.txt for more
   information
+* Add a message if category is empty
 
 == Bugfixes since 1.10 ==
 
diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 426fbb1146..435a3f4b24 100644
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -90,6 +90,11 @@ class CategoryViewer {
 			$this->getImageSection() .
 			$this->getCategoryBottom();
 
+		// Give a proper message if category is empty
+		if ( $r == '' ) {
+			$r = wfMsgExt( 'category-empty', array( 'parse' ) );
+		}
+
 		wfProfileOut( __METHOD__ );
 		return $r;
 	}
@@ -229,13 +234,15 @@ class CategoryViewer {
 	}
 
 	function getCategoryTop() {
-		$r = "<br style=\"clear:both;\"/>\n";
+		$r = '';
 		if( $this->until != '' ) {
 			$r .= $this->pagingLinks( $this->title, $this->nextPage, $this->until, $this->limit );
 		} elseif( $this->nextPage != '' || $this->from != '' ) {
 			$r .= $this->pagingLinks( $this->title, $this->from, $this->nextPage, $this->limit );
 		}
-		return $r;
+		return $r == ''
+			? $r
+			: "<br style=\"clear:both;\"/>\n" . $r;
 	}
 
 	function getSubcategorySection() {
diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index e7d9521d59..ff997ad3b3 100644
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -253,6 +253,7 @@ $messages = array(
 'category_header'       => 'Seiten in der Kategorie „$1“',
 'subcategories'         => 'Unterkategorien',
 'category-media-header' => 'Medien in der Kategorie „$1“',
+'category-empty'        => "''Diese Kategorie enthält zur Zeit keine Artikel oder Medien.''",
 
 'mainpagetext'      => 'MediaWiki wurde erfolgreich installiert.',
 'mainpagedocfooter' => 'Hilfe zur Benutzung und Konfiguration der Wiki Software finden Sie im [http://meta.wikimedia.org/wiki/Help:Contents Benutzerhandbuch].
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 87c291abea..5f7aa3e54b 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -562,6 +562,7 @@ XHTML id names.
 'category_header'       => 'Articles in category "$1"',
 'subcategories'         => 'Subcategories',
 'category-media-header' => 'Media in category "$1"',
+'category-empty'        => "''This category contains currently no articles or media.''",
 
 'linkprefix'        => '/^(.*?)([a-zA-Z\x80-\xff]+)$/sD', # only translate this message to other languages if you have to change it
 'mainpagetext'      => "<big>'''MediaWiki has been successfully installed.'''</big>",
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 2351877ee3..439ef53f15 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -118,6 +118,7 @@ $wgMessageStructure = array(
 		'category_header',
 		'subcategories',
 		'category-media-header',
+		'category-empty',
 	),
 	'mainpage' => array(
 		'linkprefix',
-- 
2.20.1