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

Fix strlen() null deprecation in AccountController.php #4155

Merged
merged 9 commits into from
Sep 6, 2024
Merged

Fix strlen() null deprecation in AccountController.php #4155

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ce27d9e
Fix strlen() null deprecation in AccountController.php
kiatng Aug 15, 2024
fd8dca3
Check for null.
kiatng Aug 16, 2024
5694083
Update app/code/core/Mage/Customer/controllers/AccountController.php
kiatng Aug 16, 2024
a777175
Merge branch 'main' into null_deprecation_accountcontroller
kiatng Aug 22, 2024
0f73b51
Removed null returned type.
kiatng Aug 26, 2024
e059e16
Merge branch 'null_deprecation_accountcontroller' of https://github.c…
kiatng Aug 26, 2024
28787e2
Merge branch 'main' into null_deprecation_accountcontroller
sreichel Sep 2, 2024
e0c40e3
Merge branch 'main' into null_deprecation_accountcontroller
sreichel Sep 2, 2024
59566a8
Merge branch 'main' into null_deprecation_accountcontroller
sreichel Sep 6, 2024
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
6 changes: 3 additions & 3 deletions app/code/core/Mage/Customer/controllers/AccountController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,12 +891,12 @@ public function resetPasswordPostAction()
}

/**
* @return string|false
* @return string|false|null
*/
protected function getCustomerId()
{
$customerId = $this->getRequest()->getQuery('id', false);
if (strlen($customerId) > 12) {
$customerId = $this->getRequest()->getQuery("id");
kiatng marked this conversation as resolved.
Show resolved Hide resolved
if ($customerId !== null && strlen($customerId) > 12) {
$customerCollection = Mage::getModel('customer/customer')
->getCollection()
->addAttributeToSelect(['rp_customer_id'])
Expand Down
Loading