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

Title::newFromText: Cast integers to strings

Browse source 
This is the cause of the T76305 debug log entries relating to SpecialExport
and Echo.

Bug: T76305
Bug: T116034
Change-Id: I64d629d31be79c4b4702a4298bce68fd544df6e8
This commit is contained in:
This, that and the other 2016-01-29 10:52:37 +11:00
parent b6abce7edc
commit eda82d60c6
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
includes/Title.php
View file

@ -246,7 +246,7 @@ class Title {
* Create a new Title from text, such as what one would find in a link. De-
* codes any HTML entities in the text.
*
* @param string|null $text The link text; spaces, prefixes, and an
* @param string|int|null $text The link text; spaces, prefixes, and an
* initial ':' indicating the main namespace are accepted.
* @param int $defaultNamespace The namespace to use if none is specified
* by a prefix. If you want to force a specific namespace even if
@ -259,7 +259,8 @@ class Title {
if ( is_object( $text ) ) {
throw new InvalidArgumentException( '$text must be a string.' );
}
if ( $text !== null && !is_string( $text ) ) {
// DWIM: Integers can be passed in here when page titles are used as array keys.
if ( $text !== null && !is_string( $text ) && !is_int( $text ) ) {
wfDebugLog( 'T76305', wfGetAllCallers( 5 ) );
return null;
}
@ -268,7 +269,7 @@ class Title {
}
try {
return Title::newFromTextThrow( $text, $defaultNamespace );
return Title::newFromTextThrow( strval( $text ), $defaultNamespace );
} catch ( MalformedTitleException $ex ) {
return null;
}