Skip to content

EAV Config Cache revert return empty attribute model #3074

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

Merged
merged 14 commits into from
Mar 9, 2023
Merged

EAV Config Cache revert return empty attribute model #3074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f41bdb5
fix exception when collection selects non-existent attribute in PR #2993
davidhiendl Feb 22, 2023
23f1152
fix exception when eav/config cache is initialized for multiple store…
davidhiendl Feb 24, 2023
ca44294
remove type parameters from method signature to avoid breaking compat…
davidhiendl Feb 27, 2023
c382c90
Merge branch '20.0' into eav_config_cache_multi_scope_load
fballiano Mar 3, 2023
7042ae9
Merge branch '20.0' into eav_config_cache_multi_scope_load
fballiano Mar 8, 2023
0047bad
avoid changing signature of getAttributeCollection, add newAttributeC…
davidhiendl Mar 9, 2023
e970d4e
Merge branch '20.0' into eav_config_cache_multi_scope_load
fballiano Mar 9, 2023
88756ab
Merge remote-tracking branch 'origin/eav_config_cache_multi_scope_loa…
davidhiendl Mar 9, 2023
d6de2e7
remove newAttributeCollection redundant arguments
davidhiendl Mar 9, 2023
5faac00
Merge branch '20.0' into eav_config_cache_multi_scope_load
fballiano Mar 9, 2023
4bfa01c
revert change in behaviour from #2993 where getAttribute no longer re…
davidhiendl Mar 9, 2023
ab375b1
Merge branch '20.0' into eav_config_cache_revert_attribute_empty_model
fballiano Mar 9, 2023
853a4a5
removed comment
fballiano Mar 9, 2023
2650127
slightly changed comment
fballiano Mar 9, 2023
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: 5 additions & 0 deletions app/code/core/Mage/Eav/Model/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,11 @@ public function getAttribute($entityType, $code, $storeId = null)
$attribute = $this->_getDefaultAttributeIfExists($entityType, $code, $storeId);
}

// return an empty model to avoid breaking compatibility
if (!$attribute) {
$attribute = $this->_hydrateAttribute(["entity_type_id" => $entityType->getId()]);
}

return $attribute;
}

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ public function addAttributeToSelect($attribute, $joinType = false)
$attrInstance = Mage::getSingleton('eav/config')
->getAttribute($this->getEntity()->getType(), $attribute);
// failure to resolve an attribute from the eav config implies it does not exist
if (empty($attrInstance)) {
if (empty($attrInstance) || !$attrInstance->getId()) {
return $this;
}
}
Expand Down