Skip to content

This is a new pull request check it #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

This is a new pull request check it #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9069cf
Update FileController.php
hexl May 9, 2015
45af2ed
Merge pull request #1 from hexl/hexl-chinese-fix
hexl May 9, 2015
70d3f0e
Update FileController.php
hexl May 10, 2015
932f49f
Update Module.php
hexl May 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Module.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public function attachFile($filePath, $owner)

$file = new File();

$file->name = pathinfo($filePath, PATHINFO_FILENAME);
$file->name = substr(pathinfo($filePath, PATHINFO_FILENAME), 1); // remove the first '_' added when save to temp folder; hexl 2015-05-10
$file->model = $this->getShortClass($owner);
$file->itemId = $owner->id;
$file->hash = $fileHash;
Expand Down
2 changes: 1 addition & 1 deletion controllers/FileController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function actionUpload()
$result['uploadedFiles'] = [];
if (is_array($model->file)) {
foreach ($model->file as $file) {
$path = $this->getModule()->getUserDirPath() . DIRECTORY_SEPARATOR . $file->name;
$path = $this->getModule()->getUserDirPath() . DIRECTORY_SEPARATOR . '_' . $file->name; // add a '_' to fix chinese file name; hexl 2015-05-10
$file->saveAs($path);
$result['uploadedFiles'][] = $file->name;
}
Expand Down