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

fixed #554 アンカーがある場合はnoneしない #1096

Merged
merged 4 commits into from
Dec 23, 2024

Conversation

nobuhiko
Copy link
Contributor

@nobuhiko nobuhiko commented Dec 23, 2024

Fixes #554

Copy link

codecov bot commented Dec 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 51.63%. Comparing base (664860e) to head (9b654d4).
Report is 5 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1096   +/-   ##
=======================================
  Coverage   51.63%   51.63%           
=======================================
  Files          80       80           
  Lines       10223    10223           
=======================================
  Hits         5279     5279           
  Misses       4944     4944           
Flag Coverage Δ
tests 51.63% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@nobuhiko
Copy link
Contributor Author

php-cs-fixer厳しい!ルールが違うのか

@nanasess
Copy link
Contributor

@nobuhiko
このPRは、インデントや改行の修正を除くと以下の行のみの修正という認識であってますかね?
https://github.com/EC-CUBE/ec-cube2/pull/1096/files#diff-f066e8e92977562524cd094ac184d3e0753f7ed8bac8ece6910859719318e0c5R1390

@nobuhiko
Copy link
Contributor Author

@nanasess です、みにくくてすみません

@nanasess nanasess enabled auto-merge December 23, 2024 04:32
@nanasess nanasess added this to the 2.18(仮) milestone Dec 23, 2024
|| SC_Utils_Ex::isBlank($arrSubProductData['sub_comment'.$i]) == false
|| SC_Utils_Ex::isBlank($arrSubProductData['sub_image'.$i]) == false
|| SC_Utils_Ex::isBlank($arrSubProductData['sub_large_image'.$i]) == false
|| SC_Utils_Ex::isBlank($arrSubProductData['temp_sub_image'.$i]) == false
|| SC_Utils_Ex::isBlank($arrSubProductData['temp_sub_large_image'.$i]) == false
|| $arrSubProductData['image_key'] == 'sub_image'.$i
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
|| $arrSubProductData['image_key'] == 'sub_image'.$i
|| $arrSubProductData['image_key'] == 'sub_image'.$i
|| $arrSubProductData['image_key'] == 'sub_large_image'.$i

最初にサブ拡大画像にアップロードすると閉じてしまったので、'sub_large_image'.$i も追加でお願いします

Copy link
Contributor

@nanasess nanasess left a comment

Choose a reason for hiding this comment

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

LGTM

@nanasess nanasess merged commit 2fe0c3a into EC-CUBE:master Dec 23, 2024
108 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

商品サブ情報の画像をアップロードした時の挙動
2 participants