Add missing null to string casts when using rd_fragment and such
These columns are nullable, but the method doesn't accept null. Found in Logstash. Change-Id: I3eaafe31005c9319fdd03f8f4b54e7b51ef430f9
This commit is contained in:
parent
0bfe17ad12
commit
41ec072d16
4 changed files with 13 additions and 7 deletions
|
|
@ -1212,8 +1212,8 @@ class ApiPageSet extends ApiBase {
|
||||||
$to = Title::makeTitle(
|
$to = Title::makeTitle(
|
||||||
$row->rd_namespace,
|
$row->rd_namespace,
|
||||||
$row->rd_title,
|
$row->rd_title,
|
||||||
$row->rd_fragment,
|
$row->rd_fragment ?? '',
|
||||||
$row->rd_interwiki
|
$row->rd_interwiki ?? ''
|
||||||
);
|
);
|
||||||
$this->mResolvedRedirectTitles[$from] = $this->mPendingRedirectIDs[$rdfrom];
|
$this->mResolvedRedirectTitles[$from] = $this->mPendingRedirectIDs[$rdfrom];
|
||||||
unset( $this->mPendingRedirectIDs[$rdfrom] );
|
unset( $this->mPendingRedirectIDs[$rdfrom] );
|
||||||
|
|
|
||||||
|
|
@ -234,7 +234,7 @@ class DoubleRedirectJob extends Job {
|
||||||
$row->rd_namespace,
|
$row->rd_namespace,
|
||||||
$row->rd_title,
|
$row->rd_title,
|
||||||
'',
|
'',
|
||||||
$row->rd_interwiki
|
$row->rd_interwiki ?? ''
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -121,7 +121,11 @@ class SpecialBrokenRedirects extends QueryPage {
|
||||||
public function formatResult( $skin, $result ) {
|
public function formatResult( $skin, $result ) {
|
||||||
$fromObj = Title::makeTitle( $result->namespace, $result->title );
|
$fromObj = Title::makeTitle( $result->namespace, $result->title );
|
||||||
if ( isset( $result->rd_title ) ) {
|
if ( isset( $result->rd_title ) ) {
|
||||||
$toObj = Title::makeTitle( $result->rd_namespace, $result->rd_title, $result->rd_fragment );
|
$toObj = Title::makeTitle(
|
||||||
|
$result->rd_namespace,
|
||||||
|
$result->rd_title,
|
||||||
|
$result->rd_fragment ?? ''
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
$blinks = $fromObj->getBrokenLinksFrom(); # TODO: check for redirect, not for links
|
$blinks = $fromObj->getBrokenLinksFrom(); # TODO: check for redirect, not for links
|
||||||
if ( $blinks ) {
|
if ( $blinks ) {
|
||||||
|
|
|
||||||
|
|
@ -124,9 +124,11 @@ class SpecialListRedirects extends QueryPage {
|
||||||
*/
|
*/
|
||||||
protected function getRedirectTarget( $row ) {
|
protected function getRedirectTarget( $row ) {
|
||||||
if ( isset( $row->rd_title ) ) {
|
if ( isset( $row->rd_title ) ) {
|
||||||
return Title::makeTitle( $row->rd_namespace,
|
return Title::makeTitle(
|
||||||
$row->rd_title, $row->rd_fragment,
|
$row->rd_namespace,
|
||||||
$row->rd_interwiki
|
$row->rd_title,
|
||||||
|
$row->rd_fragment ?? '',
|
||||||
|
$row->rd_interwiki ?? ''
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
$title = Title::makeTitle( $row->namespace, $row->title );
|
$title = Title::makeTitle( $row->namespace, $row->title );
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue