Merge branch 'master' into zenops_46

2022-12-02 10:04:48 +08:00
parent be15d17af9 57ea3dc290
commit f58e24e6fc
98 changed files with 725 additions and 260 deletions
@@ -2365,6 +2365,8 @@ EOD;
     */
    public function checkSafeFile()
    {
+        if($this->app->isContainer()) return false;
+
        if($this->app->getModuleName() == 'upgrade' and $this->session->upgrading) return false;

        $statusFile = $this->app->getAppRoot() . 'www' . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'ok.txt';