http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88825
Revision: 88825
Author: demon
Date: 2011-05-25 19:52:27 +0000 (Wed, 25 May 2011)
Log Message:
-----------
MFT r88215
Modified Paths:
--------------
branches/wmf/1.17wmf1/extensions/CentralAuth/SpecialWikiSets.php
Property Changed:
----------------
branches/wmf/1.17wmf1/extensions/CentralAuth/SpecialWikiSets.php
Modified: branches/wmf/1.17wmf1/extensions/CentralAuth/SpecialWikiSets.php
===================================================================
--- branches/wmf/1.17wmf1/extensions/CentralAuth/SpecialWikiSets.php
2011-05-25 19:49:46 UTC (rev 88824)
+++ branches/wmf/1.17wmf1/extensions/CentralAuth/SpecialWikiSets.php
2011-05-25 19:52:27 UTC (rev 88825)
@@ -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;
Property changes on:
branches/wmf/1.17wmf1/extensions/CentralAuth/SpecialWikiSets.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/extensions/CentralAuth/SpecialWikiSets.php:51646
/branches/new-installer/phase3/extensions/CentralAuth/SpecialWikiSets.php:43664-66004
/branches/sqlite/extensions/CentralAuth/SpecialWikiSets.php:58211-58321
/branches/wmf/1.16wmf4/extensions/CentralAuth/SpecialWikiSets.php:67177,69199,76243,77266
/branches/wmf-deployment/extensions/CentralAuth/SpecialWikiSets.php:60970
/trunk/extensions/CentralAuth/specials/SpecialWikiSets.php:88215
/trunk/phase3/extensions/CentralAuth/SpecialWikiSets.php:79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80406,81833,83212,83590
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
