Skip to content
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.

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

fix #3098 【5.1】エディタテンプレート新規登録・編集で必須項目を記入せず、アイコン画像を入れ保存するとエラーが発生する【エディタテンプレート】 #3114

Merged
merged 2 commits into from
Feb 16, 2024

Conversation

HungDV2022
Copy link
Collaborator

No description provided.

@@ -865,18 +865,18 @@ public function file($fieldName, $options = []): string

// PHP5.3対応のため、is_string($value) 判別を実行
$delCheckTag = '';
if ($fileLinkTag && $linkOptions['delCheck'] && (is_string($value) || empty($value['session_key']))) {
if ($fileLinkTag && $linkOptions['delCheck'] && (is_string($value) || (is_object($value) && $value->getError() == UPLOAD_ERR_NO_FILE))) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@HungDV2022 empty($value['session_key']) は削除しないようにしてください、ファイルの一時保存機能が正常動作しなくなるためです

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ryuring empty($value['session_key'])を追加しました。確認お願いします。

@ryuring ryuring added the Reviewed レビュー済 label Feb 15, 2024
@ryuring ryuring assigned HungDV2022 and unassigned ryuring Feb 15, 2024
@ryuring ryuring modified the milestones: 5.0.9, 5.1.0 Feb 15, 2024
@HungDV2022 HungDV2022 assigned ryuring and unassigned HungDV2022 Feb 15, 2024
@ryuring
Copy link
Collaborator

ryuring commented Feb 16, 2024

@HungDV2022 ありがとうございました。マージします。

@ryuring ryuring merged commit bb765aa into baserproject:dev-5.1 Feb 16, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Reviewed レビュー済
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants