From 377ce5a469476a0ec68a6f03e3f5714eb40caeff Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Tue, 3 Jul 2018 11:59:18 -0400 Subject: [PATCH] Fix error in various deprecated selectFields() methods When aliasing a field to null, it has to be aliased to the string 'NULL' rather than PHP null. Bug: T198687 Change-Id: I6096f306b97022da781eaabeb15e502f391673a9 --- includes/Block.php | 2 +- includes/filerepo/file/ArchivedFile.php | 2 +- includes/filerepo/file/LocalFile.php | 2 +- includes/filerepo/file/OldLocalFile.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/Block.php b/includes/Block.php index 9567b06803..a7b80352b3 100644 --- a/includes/Block.php +++ b/includes/Block.php @@ -224,7 +224,7 @@ class Block { 'ipb_address', 'ipb_by', 'ipb_by_text', - 'ipb_by_actor' => $wgActorTableSchemaMigrationStage > MIGRATION_OLD ? 'ipb_by_actor' : null, + 'ipb_by_actor' => $wgActorTableSchemaMigrationStage > MIGRATION_OLD ? 'ipb_by_actor' : 'NULL', 'ipb_timestamp', 'ipb_auto', 'ipb_anon_only', diff --git a/includes/filerepo/file/ArchivedFile.php b/includes/filerepo/file/ArchivedFile.php index 65e43459fe..5589c687e5 100644 --- a/includes/filerepo/file/ArchivedFile.php +++ b/includes/filerepo/file/ArchivedFile.php @@ -248,7 +248,7 @@ class ArchivedFile { 'fa_minor_mime', 'fa_user', 'fa_user_text', - 'fa_actor' => $wgActorTableSchemaMigrationStage > MIGRATION_OLD ? 'fa_actor' : null, + 'fa_actor' => $wgActorTableSchemaMigrationStage > MIGRATION_OLD ? 'fa_actor' : 'NULL', 'fa_timestamp', 'fa_deleted', 'fa_deleted_timestamp', /* Used by LocalFileRestoreBatch */ diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php index e86f292703..7206dce4a4 100644 --- a/includes/filerepo/file/LocalFile.php +++ b/includes/filerepo/file/LocalFile.php @@ -223,7 +223,7 @@ class LocalFile extends File { 'img_minor_mime', 'img_user', 'img_user_text', - 'img_actor' => $wgActorTableSchemaMigrationStage > MIGRATION_OLD ? 'img_actor' : null, + 'img_actor' => $wgActorTableSchemaMigrationStage > MIGRATION_OLD ? 'img_actor' : 'NULL', 'img_timestamp', 'img_sha1', ] + MediaWikiServices::getInstance()->getCommentStore()->getFields( 'img_description' ); diff --git a/includes/filerepo/file/OldLocalFile.php b/includes/filerepo/file/OldLocalFile.php index aa434d0c8f..b5c44f2c6e 100644 --- a/includes/filerepo/file/OldLocalFile.php +++ b/includes/filerepo/file/OldLocalFile.php @@ -138,7 +138,7 @@ class OldLocalFile extends LocalFile { 'oi_minor_mime', 'oi_user', 'oi_user_text', - 'oi_actor' => $wgActorTableSchemaMigrationStage > MIGRATION_OLD ? 'oi_actor' : null, + 'oi_actor' => $wgActorTableSchemaMigrationStage > MIGRATION_OLD ? 'oi_actor' : 'NULL', 'oi_timestamp', 'oi_deleted', 'oi_sha1', -- 2.20.1