From 9d0322a1b8ffe74835a53f5ee402d3eff33e3921 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Thu, 30 Jun 2022 14:15:13 +0800
Subject: [PATCH] * Fix bug #24102.

---
 module/block/model.php          | 1 +
 module/block/view/main.html.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/block/model.php b/module/block/model.php
index 62fe91b209..baaa0b6be0 100644
--- a/module/block/model.php
+++ b/module/block/model.php
@@ -34,6 +34,7 @@ class blockModel extends model
             ->setDefault('grid', '4')
             ->setDefault('source', $source)
             ->setDefault('block', $type)
+            ->setDefault('vision', $this->config->vision)
             ->setDefault('params', array())
             ->remove('uid,actionLink,modules,moduleBlock')
             ->get();
diff --git a/module/block/view/main.html.php b/module/block/view/main.html.php
index d90a21d363..debaacd1b0 100644
--- a/module/block/view/main.html.php
+++ b/module/block/view/main.html.php
@@ -10,6 +10,7 @@
  * @link        http://www.zentao.pms
  */
 $viewDir      = dirname(__FILE__);
-$file2Include = file_exists(dirname($viewDir) . "/ext/view/{$code}block.html.php") ? dirname($viewDir) . "/ext/view/{$code}block.html.php" : "{$viewDir}/{$code}block.html.php";
+$extFire      = $app->getExtensionRoot() . $config->edition . "/block/ext/view/{$code}block.html.php";
+$file2Include = file_exists($extFire) ? $extFire : "{$viewDir}/{$code}block.html.php";
 include $file2Include;
 ?>