From 11bf1cd3b511ef6e752e6f91d26a74f23d697c8d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 25 Apr 2004 01:01:38 +0000
Subject: [PATCH] Disable renaming of category pages (this causes a number of
 problems currently which make it a dubious thing to try to do). Fix HTML for
 error display on move. Add error class to style sheets. Fix error call in
 protect. Remove dupe function that was moved from skin to output.

---
 includes/Article.php          |  2 +-
 includes/Namespace.php        |  2 +-
 includes/SkinPHPTal.php       | 23 -----------------------
 includes/SpecialMovepage.php  |  2 +-
 stylesheets/common.css        |  4 ++++
 stylesheets/monobook/main.css |  4 ++++
 6 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/includes/Article.php b/includes/Article.php
index f0dba9725f..3289dd14b0 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -759,7 +759,7 @@ class Article {
 		}
 		$id = $this->mTitle->getArticleID();
 		if ( 0 == $id ) {
-			$wgOut->fatalEror( wfMsg( "badarticleerror" ) );
+			$wgOut->fatalError( wfMsg( "badarticleerror" ) );
 			return;
 		}
 
diff --git a/includes/Namespace.php b/includes/Namespace.php
index a619b82561..e3fdab57a9 100644
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -62,7 +62,7 @@ class Namespace {
 
 	function isMovable( $index )
 	{
-		if ( $index < NS_MAIN || $index == NS_IMAGE ) { 
+		if ( $index < NS_MAIN || $index == NS_IMAGE  || $index == NS_CATEGORY ) { 
 			return false; 
 		}
 		return true;
diff --git a/includes/SkinPHPTal.php b/includes/SkinPHPTal.php
index 1d48775ed8..53420d93f3 100644
--- a/includes/SkinPHPTal.php
+++ b/includes/SkinPHPTal.php
@@ -480,29 +480,6 @@
 			return $nav_urls;
 		}
 
-		function getPageTitleActionText () {
-			global $action;
-			switch($action) {
-				case 'edit':
-					return 	wfMsg('edit');
-				case 'history':
-					return wfMsg('history_short');
-				case 'protect':
-					return wfMsg('unprotect');
-				case 'unprotect':
-					return wfMsg('unprotect');
-				case 'delete':
-					return wfMsg('delete');
-				case 'watch':
-					return wfMsg('watch');
-				case 'unwatch':
-					return wfMsg('unwatch');
-				case 'submit':
-					return wfMsg('preview');
-				default:
-					return '';
-			}
-		}
 		/*static*/ function makeSpecialUrl( $name, $urlaction='' ) {
 			$title = Title::makeTitle( NS_SPECIAL, $name );
 			$this->checkTitle(&$title, &$name);	
diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php
index f3a25fe48a..07ef62e152 100644
--- a/includes/SpecialMovepage.php
+++ b/includes/SpecialMovepage.php
@@ -61,7 +61,7 @@ class MovePageForm {
 
 		if ( "" != $err ) {
 			$wgOut->setSubtitle( wfMsg( "formerror" ) );
-			$wgOut->addHTML( "<p><font color='red' size='+1'>{$err}</font>\n" );
+			$wgOut->addHTML( "<p class='error'>{$err}</p>\n" );
 		}
 		$wgOut->addHTML( "
 <form id=\"movepage\" method=\"post\" action=\"{$action}\">
diff --git a/stylesheets/common.css b/stylesheets/common.css
index 6afed32003..998528c540 100644
--- a/stylesheets/common.css
+++ b/stylesheets/common.css
@@ -95,3 +95,7 @@ img { border: none; }
         font-size: 95%;
 }
 
+.error {
+	color: red;
+	font-size: larger;
+}
diff --git a/stylesheets/monobook/main.css b/stylesheets/monobook/main.css
index f542da7510..e91e00f90a 100644
--- a/stylesheets/monobook/main.css
+++ b/stylesheets/monobook/main.css
@@ -998,3 +998,7 @@ head:first-child+body #portlet-personal {
 /* debugging tool.. */
 /*div{ border:1px solid #000000;}*/
 
+.error {
+	color: red;
+	font-size: larger;
+}
-- 
2.20.1