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.

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

LC_Page_Mypage_DeliveryAddr 遷移チェックの定義重複しているのを修正 #1132

Merged
merged 3 commits into from
Jan 11, 2025
Merged

LC_Page_Mypage_DeliveryAddr 遷移チェックの定義重複しているのを修正 #1132

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
074f6c1
LC_Page_Mypage_DeliveryAddr 遷移チェックの定義重複しているのを修正
nanasess Jan 9, 2025
7daf3e4
Merge branch 'master' into fix-valid-url
nanasess Jan 10, 2025
6acf1b3
Merge branch 'master' into fix-valid-url
nanasess Jan 11, 2025
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
5 changes: 2 additions & 3 deletions data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*/
class LC_Page_Mypage_DeliveryAddr extends LC_Page_Ex
{
/** @var string */
/** @var array */
public $validUrl;
/** @var string */
public $ParentPage;
Expand Down Expand Up @@ -87,8 +87,7 @@ public function action()
}

// 正しい遷移かをチェック
$arrParentPageList = [DELIV_URLPATH, MYPAGE_DELIVADDR_URLPATH, MULTIPLE_URLPATH];
if (!SC_Utils_Ex::isBlank($ParentPage) && !in_array($ParentPage, $arrParentPageList)) {
if (!SC_Utils_Ex::isBlank($ParentPage) && !in_array($ParentPage, $this->validUrl)) {
// 遷移が正しくない場合、デフォルトであるマイページの配送先追加の画面を設定する
$ParentPage = MYPAGE_DELIVADDR_URLPATH;
}
Expand Down
Loading