From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 27 Dec 2014 15:41:37 +0100
Subject: Update to MediaWiki 1.24.1

---
 includes/CategoryPage.php | 118 ----------------------------------------------
 1 file changed, 118 deletions(-)
 delete mode 100644 includes/CategoryPage.php

(limited to 'includes/CategoryPage.php')

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
deleted file mode 100644
index ba71aa01..00000000
--- a/includes/CategoryPage.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * 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
- */
-
-/**
- * Special handling for category description pages, showing pages,
- * subcategories and file that belong to the category
- */
-class CategoryPage extends Article {
-	# Subclasses can change this to override the viewer class.
-	protected $mCategoryViewerClass = 'CategoryViewer';
-
-	/**
-	 * @param $title Title
-	 * @return WikiCategoryPage
-	 */
-	protected function newPage( Title $title ) {
-		// Overload mPage with a category-specific page
-		return new WikiCategoryPage( $title );
-	}
-
-	/**
-	 * Constructor from a page id
-	 * @param int $id article ID to load
-	 * @return CategoryPage|null
-	 */
-	public static function newFromID( $id ) {
-		$t = Title::newFromID( $id );
-		# @todo FIXME: Doesn't inherit right
-		return $t == null ? null : new self( $t );
-		# return $t == null ? null : new static( $t ); // PHP 5.3
-	}
-
-	function view() {
-		$request = $this->getContext()->getRequest();
-		$diff = $request->getVal( 'diff' );
-		$diffOnly = $request->getBool( 'diffonly',
-			$this->getContext()->getUser()->getOption( 'diffonly' ) );
-
-		if ( $diff !== null && $diffOnly ) {
-			parent::view();
-			return;
-		}
-
-		if ( !wfRunHooks( 'CategoryPageView', array( &$this ) ) ) {
-			return;
-		}
-
-		$title = $this->getTitle();
-		if ( NS_CATEGORY == $title->getNamespace() ) {
-			$this->openShowCategory();
-		}
-
-		parent::view();
-
-		if ( NS_CATEGORY == $title->getNamespace() ) {
-			$this->closeShowCategory();
-		}
-	}
-
-	function openShowCategory() {
-		# For overloading
-	}
-
-	function closeShowCategory() {
-		// Use these as defaults for back compat --catrope
-		$request = $this->getContext()->getRequest();
-		$oldFrom = $request->getVal( 'from' );
-		$oldUntil = $request->getVal( 'until' );
-
-		$reqArray = $request->getValues();
-
-		$from = $until = array();
-		foreach ( array( 'page', 'subcat', 'file' ) as $type ) {
-			$from[$type] = $request->getVal( "{$type}from", $oldFrom );
-			$until[$type] = $request->getVal( "{$type}until", $oldUntil );
-
-			// Do not want old-style from/until propagating in nav links.
-			if ( !isset( $reqArray["{$type}from"] ) && isset( $reqArray["from"] ) ) {
-				$reqArray["{$type}from"] = $reqArray["from"];
-			}
-			if ( !isset( $reqArray["{$type}to"] ) && isset( $reqArray["to"] ) ) {
-				$reqArray["{$type}to"] = $reqArray["to"];
-			}
-		}
-
-		unset( $reqArray["from"] );
-		unset( $reqArray["to"] );
-
-		$viewer = new $this->mCategoryViewerClass(
-			$this->getContext()->getTitle(),
-			$this->getContext(),
-			$from,
-			$until,
-			$reqArray
-		);
-		$this->getContext()->getOutput()->addHTML( $viewer->getHTML() );
-	}
-}
-- 
cgit v1.2.3-54-g00ecf