From 7291ebc8b1ab29f5abe628b9065b7bcc474a4150 Mon Sep 17 00:00:00 2001 From: Nick Liu Date: Wed, 29 Apr 2020 10:50:50 -0500 Subject: [PATCH] Fixes #4114 - Better file inspector corruption warning message Now advises admins to reupload using binary mode if the admin uploads files with FTP --- .github/workflows/build-release.yml | 6 ++++-- e107_handlers/e107_class.php | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index a0d6bb1cf..417c270a1 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -18,12 +18,14 @@ jobs: - name: Install operating system dependencies run: sudo apt-get install -y git tar gzip xz-utils zip php-cli - - uses: actions/checkout@v2 + - uses: actions/checkout@v2.1.0 with: fetch-depth: 0 - name: Fetch version information - run: git fetch origin +refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* + run: | + git remote set-url origin "$(git remote get-url origin | sed 's|^git@github\.com:|https://github.com/|')" + git fetch origin +refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* # Remove this step if the old version tags make it to the official repository. - name: Fetch version information from really old releases diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index e7af36a80..86c015c46 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -1627,6 +1627,7 @@ class e107 "File Inspector will be inoperative. " . "Resolve this issue by uploading a good copy of the core image to " . escapeshellarg($fileInspectorPath) . ". " . + "If uploading with FTP, use binary transfer mode. " . "Error message: " . $e->getMessage() );