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.
This commit is contained in:
Brion Vibber 2004-04-25 01:01:38 +00:00
parent 1e3a9f9580
commit 11bf1cd3b5
6 changed files with 11 additions and 26 deletions

View file

@ -759,7 +759,7 @@ class Article {
}
$id = $this->mTitle->getArticleID();
if ( 0 == $id ) {
$wgOut->fatalEror( wfMsg( "badarticleerror" ) );
$wgOut->fatalError( wfMsg( "badarticleerror" ) );
return;
}

View file

@ -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;

View file

@ -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);

View file

@ -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}\">

View file

@ -95,3 +95,7 @@ img { border: none; }
font-size: 95%;
}
.error {
color: red;
font-size: larger;
}

View file

@ -998,3 +998,7 @@ head:first-child+body #portlet-personal {
/* debugging tool.. */
/*div{ border:1px solid #000000;}*/
.error {
color: red;
font-size: larger;
}