X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FCommentStore.php;h=cba7a150d3a49360eff355d3b4f0401fb86b3130;hb=c31d80f1bf7129350042a8a006886adf5bcd1996;hp=7a2726f2917126ff162477fe5a4148370891fd4c;hpb=d7fba6c62decdcbd108cdd26b49a9075377e6368;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/CommentStore.php b/includes/CommentStore.php index 7a2726f291..cba7a150d3 100644 --- a/includes/CommentStore.php +++ b/includes/CommentStore.php @@ -70,11 +70,7 @@ class CommentStore { 'deprecatedIn' => null, ], 'img_description' => [ - 'table' => 'image_comment_temp', - 'pk' => 'imgcomment_name', - 'field' => 'imgcomment_description_id', - 'joinPK' => 'img_name', - 'stage' => MIGRATION_WRITE_NEW, + 'stage' => MIGRATION_NEW, 'deprecatedIn' => '1.32', ], ]; @@ -226,8 +222,14 @@ class CommentStore { if ( $tempTableStage === MIGRATION_OLD ) { $joinField = "{$alias}.{$t['field']}"; } else { + // Nothing hits this code path for now, but will in the future when we set + // $this->tempTables['rev_comment']['stage'] to MIGRATION_WRITE_NEW while + // merging revision_comment_temp into revision. + // @codeCoverageIgnoreStart $joins[$alias][0] = 'LEFT JOIN'; $joinField = "(CASE WHEN {$key}_id != 0 THEN {$key}_id ELSE {$alias}.{$t['field']} END)"; + throw new LogicException( 'Nothing should reach this code path at this time' ); + // @codeCoverageIgnoreEnd } } else { $joinField = "{$key}_id";