Merge "Fix comment handling on image upload or deletion"

[lhc/web/wiklou.git] / includes / filerepo / file / LocalFile.php

diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index 32d1301..ebbc8f8 100644 (file)
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1543,8 +1543,8 @@ class LocalFile extends File {
                        }
                        if ( $wgCommentTableSchemaMigrationStage >= MIGRATION_WRITE_BOTH ) {
                                $tables[] = 'image_comment_temp';
-                               $fields['oi_description_id'] =
-                                       'CASE WHEN img_description_id = 0 THEN imgcomment_description_id ELSE img_description_id END';
+                               $fields['oi_description_id'] = 'CASE WHEN img_description_id = 0 '
+                                       . 'THEN COALESCE(imgcomment_description_id, 0) ELSE img_description_id END';
                                $joins['image_comment_temp'] = [
                                        $wgCommentTableSchemaMigrationStage === MIGRATION_NEW ? 'JOIN' : 'LEFT JOIN',
                                        [ 'imgcomment_name = img_name' ]
@@ -2545,8 +2545,8 @@ class LocalFileDeleteBatch {
                        }
                        if ( $wgCommentTableSchemaMigrationStage >= MIGRATION_WRITE_BOTH ) {
                                $tables[] = 'image_comment_temp';
-                               $fields['fa_description_id'] =
-                                       'CASE WHEN img_description_id = 0 THEN imgcomment_description_id ELSE img_description_id END';
+                               $fields['fa_description_id'] = 'CASE WHEN img_description_id = 0 '
+                                       . 'THEN COALESCE(imgcomment_description_id, 0) ELSE img_description_id END';
                                $joins['image_comment_temp'] = [
                                        $wgCommentTableSchemaMigrationStage === MIGRATION_NEW ? 'JOIN' : 'LEFT JOIN',
                                        [ 'imgcomment_name = img_name' ]