r85011 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r85010‎ | r85011 | r85012 >
Date:14:35, 30 March 2011
Author:demon
Status:ok
Tags:
Comment:
One last deployment merge: r81956 to trunk
Modified paths:
  • /trunk/extensions/CentralAuth/SpecialWikiSets.php (modified) (history)

Diff [purge]

Index: trunk/extensions/CentralAuth/SpecialWikiSets.php
@@ -42,8 +42,8 @@
4343 $this->buildMainView();
4444 }
4545 } else {
46 - if ( $subpage && !is_numeric( $subpage ) ) {
47 - $set = WikiSet::newFromName( $subpage );
 46+ if ( $subpage ) {
 47+ $set = is_numeric( $subpage ) ? WikiSet::newFromId( $subpage ) : WikiSet::newFromName( $subpage );
4848 if ( $set ) {
4949 $subpage = $set->getID();
5050 } else {
Property changes on: trunk/extensions/CentralAuth/SpecialWikiSets.php
___________________________________________________________________
Added: svn:mergeinfo
5151 Merged /branches/wmf/1.17wmf1/extensions/CentralAuth/SpecialWikiSets.php:r81956

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r81956Fix for when random numbers are entered as wiki set ids. It guarded against '...demon11:10, 11 February 2011

Status & tagging log