From 63601400e476c6cf43d985f3e7b9864681695ed4 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 18 Jan 2013 16:46:04 +0100
Subject: Update to MediaWiki 1.20.2

this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
---
 includes/CategoryPage.php | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'includes/CategoryPage.php')

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index eab7a356..32e270e8 100644
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -1,14 +1,26 @@
 <?php
 /**
- * Class for viewing MediaWiki category description pages.
+ * Special handling for category description pages.
  * Modelled after ImagePage.php.
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  */
 
-if ( !defined( 'MEDIAWIKI' ) )
-	die( 1 );
-
 /**
  * Special handling for category description pages, showing pages,
  * subcategories and file that belong to the category
@@ -29,6 +41,7 @@ class CategoryPage extends Article {
 	/**
 	 * Constructor from a page id
 	 * @param $id Int article ID to load
+	 * @return CategoryPage|null
 	 */
 	public static function newFromID( $id ) {
 		$t = Title::newFromID( $id );
-- 
cgit v1.2.2