From b206d7a67199dbed517aa83f42745dc4cbdfe2e0 Mon Sep 17 00:00:00 2001
From: Taku Amano <taku@taaas.jp>
Date: Mon, 1 Dec 2025 11:54:06 +0900
Subject: [PATCH 1/2] Fixed typo: <mt:SetVarBlock> should be used instead of
 <mt:Var>.

---
 .../tmpl/admin2023/mt_block_editor_edit_content_type.tmpl     | 4 ++--
 .../tmpl/admin2025/mt_block_editor_edit_content_type.tmpl     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/MTBlockEditor/tmpl/admin2023/mt_block_editor_edit_content_type.tmpl b/plugins/MTBlockEditor/tmpl/admin2023/mt_block_editor_edit_content_type.tmpl
index f365f38..a05b29f 100644
--- a/plugins/MTBlockEditor/tmpl/admin2023/mt_block_editor_edit_content_type.tmpl
+++ b/plugins/MTBlockEditor/tmpl/admin2023/mt_block_editor_edit_content_type.tmpl
@@ -1,4 +1,4 @@
-<mt:Var name="js_include" append="1">
+<mt:SetVarBlock name="js_include" append="1">
   <script
     src="<$mt:var name="static_uri"$>plugins/MTBlockEditor/content-field/dist/index.js?v=<mt:Var name="mt_block_editor_version" />"
     type="module"
@@ -6,4 +6,4 @@
     data-mt-block-editor-configs="<mt:Var name="mt_block_editor_configs" to_json="1" escape="html">"
     data-mt-block-editor-config-label="<__trans phrase="Preset For Movable Type Block Editor" escape="html">"
   ></script>
-</mt:Var>
+</mt:SetVarBlock>
diff --git a/plugins/MTBlockEditor/tmpl/admin2025/mt_block_editor_edit_content_type.tmpl b/plugins/MTBlockEditor/tmpl/admin2025/mt_block_editor_edit_content_type.tmpl
index f365f38..a05b29f 100644
--- a/plugins/MTBlockEditor/tmpl/admin2025/mt_block_editor_edit_content_type.tmpl
+++ b/plugins/MTBlockEditor/tmpl/admin2025/mt_block_editor_edit_content_type.tmpl
@@ -1,4 +1,4 @@
-<mt:Var name="js_include" append="1">
+<mt:SetVarBlock name="js_include" append="1">
   <script
     src="<$mt:var name="static_uri"$>plugins/MTBlockEditor/content-field/dist/index.js?v=<mt:Var name="mt_block_editor_version" />"
     type="module"
@@ -6,4 +6,4 @@
     data-mt-block-editor-configs="<mt:Var name="mt_block_editor_configs" to_json="1" escape="html">"
     data-mt-block-editor-config-label="<__trans phrase="Preset For Movable Type Block Editor" escape="html">"
   ></script>
-</mt:Var>
+</mt:SetVarBlock>

From c8eed04a2b9dfd274010d62f85a5bcceed6c3142 Mon Sep 17 00:00:00 2001
From: Taku Amano <taku@taaas.jp>
Date: Mon, 1 Dec 2025 17:24:32 +0900
Subject: [PATCH 2/2] Append $param->{js_include} in perl code instead of using
 template file.

---
 .../lib/MT/Plugin/MTBlockEditor/App/CMS.pm    | 21 ++++++++++++-------
 plugins/MTBlockEditor/t/05-app-cms.t          | 18 ++++++++++++++++
 .../mt_block_editor_edit_content_type.tmpl    |  9 --------
 .../mt_block_editor_edit_content_type.tmpl    |  9 --------
 4 files changed, 31 insertions(+), 26 deletions(-)
 delete mode 100644 plugins/MTBlockEditor/tmpl/admin2023/mt_block_editor_edit_content_type.tmpl
 delete mode 100644 plugins/MTBlockEditor/tmpl/admin2025/mt_block_editor_edit_content_type.tmpl

diff --git a/plugins/MTBlockEditor/lib/MT/Plugin/MTBlockEditor/App/CMS.pm b/plugins/MTBlockEditor/lib/MT/Plugin/MTBlockEditor/App/CMS.pm
index 6afa9e5..3382cf3 100644
--- a/plugins/MTBlockEditor/lib/MT/Plugin/MTBlockEditor/App/CMS.pm
+++ b/plugins/MTBlockEditor/lib/MT/Plugin/MTBlockEditor/App/CMS.pm
@@ -10,7 +10,7 @@ use utf8;
 
 use MT::Util qw(encode_html);
 use Class::Method::Modifiers qw(install_modifier);
-use MT::Plugin::MTBlockEditor qw(plugin blocks to_custom_block_types_json tmpl_param);
+use MT::Plugin::MTBlockEditor qw(plugin translate blocks to_custom_block_types_json tmpl_param);
 
 my $Initialized;
 
@@ -248,13 +248,18 @@ sub template_param_edit_content_type {
     my $blog    = $app->blog;
     my $blog_id = $blog ? $blog->id : 0;
 
-    my $tmpl_param = tmpl_param();
-    while (my ($k, $v) = each %$tmpl_param) {
-        $param->{$k} = $v;
-    }
-    $param->{mt_block_editor_configs} = [map { { id => $_->id, label => $_->label } } MT->model('be_config')->load({ blog_id => [0, $blog_id] })];
-
-    insert_after($tmpl, undef, 'mt_block_editor_edit_content_type.tmpl');
+    my $tmpl_param              = tmpl_param();
+    my $mt_block_editor_configs = [map { { id => $_->id, label => $_->label } } MT->model('be_config')->load({ blog_id => [0, $blog_id] })];
+
+    $param->{js_include} .= qq{
+<script
+  src="@{[$param->{static_uri}]}plugins/MTBlockEditor/content-field/dist/index.js?v=@{[$tmpl_param->{mt_block_editor_version}]}"
+  type="module"
+  id="mt-block-editor-content-field"
+  data-mt-block-editor-configs="@{[ encode_html(MT::Util::to_json($mt_block_editor_configs)) ]}"
+  data-mt-block-editor-config-label="@{[ encode_html(translate("Preset For Movable Type Block Editor")) ]}"
+></script>
+};
 }
 
 sub template_source_field_html_multi_line_text {
diff --git a/plugins/MTBlockEditor/t/05-app-cms.t b/plugins/MTBlockEditor/t/05-app-cms.t
index 475a0ac..a611951 100644
--- a/plugins/MTBlockEditor/t/05-app-cms.t
+++ b/plugins/MTBlockEditor/t/05-app-cms.t
@@ -89,6 +89,24 @@ subtest 'entry' => sub {
     like $out, qr{<option value="block_editor">MT Block Editor</option>};
 };
 
+subtest 'content_type' => sub {
+    $app = _run_app(
+        'MT::App::CMS',
+        {
+            __test_user      => $admin,
+            __request_method => 'GET',
+            __mode           => 'view',
+            _type            => 'content_type',
+            id               => $content_type->id,
+            blog_id          => $blog->id,
+        });
+    $out = delete $app->{__test_output};
+
+    # loaded
+    like $out, qr{content-field/dist/index.js};
+    like $out, qr{</html>\s*$};
+};
+
 subtest 'content_data' => sub {
     $app = _run_app(
         'MT::App::CMS',
diff --git a/plugins/MTBlockEditor/tmpl/admin2023/mt_block_editor_edit_content_type.tmpl b/plugins/MTBlockEditor/tmpl/admin2023/mt_block_editor_edit_content_type.tmpl
deleted file mode 100644
index a05b29f..0000000
--- a/plugins/MTBlockEditor/tmpl/admin2023/mt_block_editor_edit_content_type.tmpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<mt:SetVarBlock name="js_include" append="1">
-  <script
-    src="<$mt:var name="static_uri"$>plugins/MTBlockEditor/content-field/dist/index.js?v=<mt:Var name="mt_block_editor_version" />"
-    type="module"
-    id="mt-block-editor-content-field"
-    data-mt-block-editor-configs="<mt:Var name="mt_block_editor_configs" to_json="1" escape="html">"
-    data-mt-block-editor-config-label="<__trans phrase="Preset For Movable Type Block Editor" escape="html">"
-  ></script>
-</mt:SetVarBlock>
diff --git a/plugins/MTBlockEditor/tmpl/admin2025/mt_block_editor_edit_content_type.tmpl b/plugins/MTBlockEditor/tmpl/admin2025/mt_block_editor_edit_content_type.tmpl
deleted file mode 100644
index a05b29f..0000000
--- a/plugins/MTBlockEditor/tmpl/admin2025/mt_block_editor_edit_content_type.tmpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<mt:SetVarBlock name="js_include" append="1">
-  <script
-    src="<$mt:var name="static_uri"$>plugins/MTBlockEditor/content-field/dist/index.js?v=<mt:Var name="mt_block_editor_version" />"
-    type="module"
-    id="mt-block-editor-content-field"
-    data-mt-block-editor-configs="<mt:Var name="mt_block_editor_configs" to_json="1" escape="html">"
-    data-mt-block-editor-config-label="<__trans phrase="Preset For Movable Type Block Editor" escape="html">"
-  ></script>
-</mt:SetVarBlock>