http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88215
Revision: 88215
Author: vasilievvv
Date: 2011-05-16 05:24:10 +0000 (Mon, 16 May 2011)
Log Message:
-----------
Properly fix bug 28678, by not allowing to enter the set creation page in
read-only mode.
Modified Paths:
--------------
trunk/extensions/CentralAuth/specials/SpecialWikiSets.php
Modified: trunk/extensions/CentralAuth/specials/SpecialWikiSets.php
===================================================================
--- trunk/extensions/CentralAuth/specials/SpecialWikiSets.php 2011-05-16
03:35:18 UTC (rev 88214)
+++ trunk/extensions/CentralAuth/specials/SpecialWikiSets.php 2011-05-16
05:24:10 UTC (rev 88215)
@@ -42,6 +42,7 @@
$this->buildMainView();
}
} else {
+ $newPage = ( $subpage === '0' && $this->mCanEdit );
if ( $subpage ) {
$set = is_numeric( $subpage ) ?
WikiSet::newFromId( $subpage ) : WikiSet::newFromName( $subpage );
if ( $set ) {
@@ -54,9 +55,9 @@
}
}
- if ( ( $subpage || $subpage === '0' ) &&
$this->mCanEdit && $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' )
) ) {
+ if ( ( $subpage || $newPage ) && $this->mCanEdit &&
$wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ) ) {
$this->doSubmit( $subpage );
- } else if ( ( $subpage || $subpage === '0' ) &&
is_numeric( $subpage ) ) {
+ } else if ( ( $subpage || $newPage ) && is_numeric(
$subpage ) ) {
$this->buildSetView( $subpage );
} else {
$this->buildMainView();
@@ -97,12 +98,6 @@
$wgOut->setSubtitle( wfMsgExt( 'centralauth-editset-subtitle',
'parseinline' ) );
$set = ( $subpage || $subpage === '0' ) ? WikiSet::newFromID(
$subpage ) : null;
- if( !$set ) {
- $wgOut->setPageTitle( wfMsg( 'error' ) );
- $error = wfMsgExt( 'centralauth-editset-notfound',
array( 'escapenoentities' ), $subpage );
- $this->buildMainView( "<strong
class='error'>{$error}</strong>" );
- return;
- }
if ( !$name ) $name = $set ? $set->getName() : '';
if ( !$type ) $type = $set ? $set->getType() : WikiSet::OPTIN;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
