Skip to content

Commit

Permalink
Fixes #4114 - Better file inspector corruption warning message
Browse files Browse the repository at this point in the history
Now advises admins to reupload using binary mode if the admin uploads
files with FTP
  • Loading branch information
Deltik committed Apr 29, 2020
1 parent b360e55 commit 7291ebc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions e107_handlers/e107_class.php
Original file line number Diff line number Diff line change
Expand Up @@ -1627,6 +1627,7 @@ public static function getFileInspector($type = 'core')
"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()
);
Expand Down

0 comments on commit 7291ebc

Please sign in to comment.