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.

diff --git a/includes/Article.php b/includes/Article.php
index f0dba97..3289dd1 100644 (file)
--- 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 a619b82..e3fdab5 100644 (file)
--- 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 1d48775..53420d9 100644 (file)
--- 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 f3a25fe..07ef62e 100644 (file)
--- 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 6afed32..998528c 100644 (file)
--- 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 f542da7..e91e00f 100644 (file)
--- 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;
+}