Merge branch 'fixbug' into 'master'

* Fix bug #24102.

See merge request easycorp/zentaopms!4265

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();

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;
 ?>