Merge branch 'hotfix_20220913' into php8

This commit is contained in:
xiaomlove
2022-09-15 01:18:25 +08:00
2 changed files with 5 additions and 1 deletions

View File

@@ -426,8 +426,9 @@ JS;
$rowByRowHtml .= tr($field['label'], $contentFormatted, 1); $rowByRowHtml .= tr($field['label'], $contentFormatted, 1);
} }
} }
$result = $rowByRowHtml; $result = $rowByRowHtml;
if ($shouldRenderMixRow) { if ($shouldRenderMixRow && $mixedRowContent) {
$result .= tr($displayName, format_comment($mixedRowContent), 1); $result .= tr($displayName, format_comment($mixedRowContent), 1);
} }
return $result; return $result;

View File

@@ -267,6 +267,9 @@ JS;
print("</td></tr>\n"); print("</td></tr>\n");
// ---------------- end subtitle block -------------------// // ---------------- end subtitle block -------------------//
//hook before desc
do_action('torrent_detail_before_desc', $row['id'], $CURUSER['id']);
/**************start custom fields****************/ /**************start custom fields****************/
echo $customField->renderOnTorrentDetailsPage($id); echo $customField->renderOnTorrentDetailsPage($id);