Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Little change of readability in Title::secureAndSplit

Browse source 
Move init of mArticleId to bottom, where other fields are filled and
change ternary operator to a simple if for better readability.
Break a double assignment in two statements.

Change-Id: Ib61435e62e883142dd0c5dcb40e0e50e7ca18439
This commit is contained in:
umherirrender 2014-01-24 22:30:33 +01:00
parent 5f8b99668b
commit 14e6f7efe1
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
includes/Title.php
View file

@ -3210,7 +3210,8 @@ class Title {
global $wgContLang, $wgLocalInterwiki;
# Initialisation
$this->mInterwiki = $this->mFragment = '';
$this->mInterwiki = '';
$this->mFragment = '';
$this->mNamespace = $this->mDefaultNamespace; # Usually NS_MAIN
$dbkey = $this->mDbkeyform;
@ -3305,10 +3306,6 @@ class Title {
break;
} while ( true );
# We already know that some pages won't be in the database!
if ( $this->isExternal() || NS_SPECIAL == $this->mNamespace ) {
$this->mArticleID = 0;
}
$fragment = strstr( $dbkey, '#' );
if ( false !== $fragment ) {
$this->setFragment( $fragment );
@ -3378,9 +3375,9 @@ class Title {
// there are numerous ways to present the same IP. Having sp:contribs scan
// them all is silly and having some show the edits and others not is
// inconsistent. Same for talk/userpages. Keep them normalized instead.
$dbkey = ( $this->mNamespace == NS_USER || $this->mNamespace == NS_USER_TALK )
? IP::sanitizeIP( $dbkey )
: $dbkey;
if ( $this->mNamespace == NS_USER || $this->mNamespace == NS_USER_TALK ) {
$dbkey = IP::sanitizeIP( $dbkey );
}
// Any remaining initial :s are illegal.
if ( $dbkey !== '' && ':' == $dbkey[0] ) {
@ -3393,6 +3390,11 @@ class Title {
$this->mTextform = str_replace( '_', ' ', $dbkey );
# We already know that some pages won't be in the database!
if ( $this->isExternal() || $this->mNamespace == NS_SPECIAL ) {
$this->mArticleID = 0;
}
return true;
}