Merge branch 'master' into use-htmlpurifier

nanasess · Dec 23, 2024 · e53b0a7 · e53b0a7
2 parents b3135b4 + 320b42e
commit e53b0a7
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 242 deletions.
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -108,6 +108,11 @@ jobs:
         FORCE_COLOR: 1
       run: yarn ${PATTERN} e2e-tests/${GROUP}
 
+    - name: Print error log
+      if: always()
+      continue-on-error: true
+      run: docker compose exec ec-cube tail -n 100 data/logs/error.log
+
     - name: Upload evidence
       if: failure()
       uses: actions/upload-artifact@v4

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -80,6 +80,11 @@ jobs:
     - name: Run to PHPUnit SessionFactory
       run: docker compose exec -T ec-cube php data/vendor/bin/phpunit tests/class/SC_SessionFactoryTest.php
 
+    - name: Print error log
+      if: always()
+      continue-on-error: true
+      run: docker compose exec ec-cube tail -n 100 data/logs/error.log
+
     - name: Upload logs
       if: failure()
       uses: actions/upload-artifact@v4

diff --git a/data/Smarty/templates/admin/system/subnavi.tpl b/data/Smarty/templates/admin/system/subnavi.tpl
@@ -30,5 +30,4 @@
 <li<!--{if $tpl_subno == 'masterdata'}--> class="on"<!--{/if}--> id="navi-system-adminarea"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->system/adminarea.php"><span>管理画面設定</span></a></li>
 <li<!--{if $tpl_subno == 'system'}--> class="on"<!--{/if}--> id="navi-system-system"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->system/system.php"><span>システム情報</span></a></li>
 <li<!--{if $tpl_mainno == 'system' && $tpl_subno == 'log'}--> class="on"<!--{/if}--> id="navi-system-log"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->system/log.php"><span>EC-CUBE ログ表示</span></a></li>
-<li<!--{if $tpl_mainno == 'system' && $tpl_subno == 'editdb'}--> class="on"<!--{/if}--> id="navi-system-editdb"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->system/editdb.php"><span>高度なデータベース管理</span></a></li>
 </ul>
diff --git a/data/class/SC_View.php b/data/class/SC_View.php
@@ -40,7 +40,6 @@ public function __construct()
 
     public function init()
     {
-        // include_phpの利用のためSmartyBCを呼び出す、ホントはinclude_phpをなくしたいそうすれば、blank.tplもなくせる
         $this->_smarty = new \Smarty\Smarty();
         $this->_smarty->setLeftDelimiter('<!--{');
         $this->_smarty->setRightDelimiter('}-->');
@@ -74,6 +73,7 @@ public function init()
         $this->_smarty->registerPlugin('function', 'sfIsHTTPS', ['SC_Utils_Ex', 'sfIsHTTPS']);
         $this->_smarty->registerPlugin('function', 'sfSetErrorStyle', ['SC_Utils_Ex', 'sfSetErrorStyle']);
         $this->_smarty->registerPlugin('function', 'printXMLDeclaration', ['GC_Utils_Ex', 'printXMLDeclaration']);
+        $this->_smarty->muteUndefinedOrNullWarnings();
         $this->_smarty->default_modifiers = ['script_escape'];
 
         if (ADMIN_MODE == '1') {

diff --git a/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php b/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php
diff --git a/html/admin/system/editdb.php b/html/admin/system/editdb.php