From be4dd4035b89741dbbeb0814beb1799bd2f928d7 Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 5 Dec 2010 18:27:14 +0000
Subject: [PATCH] -rakkaus/#mediawiki-i18n- [05-Dec-2010 18:22:39] PHP Fatal
 error:  Call to private method CategoryViewer::getHTML() from context
 'CategoryPage' in /www/w/includes/CategoryPage.php on line 74

Partial revert of r77809, remove making of methods private, but don't reinstate the comments. They're seemingly wrong, and useless.
---
 includes/CategoryPage.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 365a255fed..820e433ffb 100644
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -102,7 +102,7 @@ class CategoryViewer {
 	 *
 	 * @return string HTML output
 	 */
-	private function getHTML() {
+	function getHTML() {
 		global $wgOut, $wgCategoryMagicGallery, $wgContLang;
 		wfProfileIn( __METHOD__ );
 
@@ -418,7 +418,7 @@ class CategoryViewer {
 	 * @param $cutoff Int
 	 * @return String
 	 */
-	private function formatList( $articles, $articles_start_char, $cutoff = 6 ) {
+	function formatList( $articles, $articles_start_char, $cutoff = 6 ) {
 		if ( count ( $articles ) > $cutoff ) {
 			return self::columnList( $articles, $articles_start_char );
 		} elseif ( count( $articles ) > 0 ) {
@@ -442,7 +442,7 @@ class CategoryViewer {
 	 * @param $articles_start_char Array
 	 * @return String
 	 */
-	private static function columnList( $articles, $articles_start_char ) {
+	static function columnList( $articles, $articles_start_char ) {
 		$columns = array_combine( $articles, $articles_start_char );
 		# Split into three columns
 		$columns = array_chunk( $columns, ceil( count( $columns ) / 3 ), true /* preserve keys */ );
@@ -493,7 +493,7 @@ class CategoryViewer {
 	 * @param $articles_start_char Array
 	 * @return String
 	 */
-	private static function shortList( $articles, $articles_start_char ) {
+	static function shortList( $articles, $articles_start_char ) {
 		$r = '<h3>' . htmlspecialchars( $articles_start_char[0] ) . "</h3>\n";
 		$r .= '<ul><li>' . $articles[0] . '</li>';
 		for ( $index = 1; $index < count( $articles ); $index++ )
-- 
2.20.1