Merge branch '18.x' into ipd1.1

2023-09-13 03:23:50 -04:00
parent 8b5f957851 4c30e47fea
commit 86b8aaa455
1091 changed files with 130798 additions and 4093 deletions
@@ -238,7 +238,9 @@
        <tfoot>
          <tr>
            <?php $colspan = $planID == 0 ? $colspan : $colspan - 1;?>
-            <td colspan='<?php echo $colspan?>' class='text-center form-actions'><?php echo html::submitButton() . ' ' . html::backButton(); ?></td>
+            <td colspan='<?php echo $colspan?>' class='text-center form-actions'>
+              <?php echo html::submitButton() . ' ' . html::backButton(); ?>
+            </td>
          </tr>
        </tfoot>
      </table>
@@ -299,4 +301,5 @@ var options = {
 }
 $('#planForm tbody.sortable').sortable(options);
 </script>
+<?php include '../../ai/view/inputinject.html.php';?>
 <?php include '../../common/view/footer.html.php';?>