Skip to content

Commit 26433d1

Browse files
Merge pull request from GHSA-jrgf-vfw2-hj26
1 parent 9d38347 commit 26433d1

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,10 @@ public function remove($attribute)
236236
$this->_fault('can_not_delete');
237237
}
238238

239+
if (!$model->getIsUserDefined()) {
240+
$this->_fault('can_not_delete');
241+
}
242+
239243
try {
240244
$model->delete();
241245
return true;

app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ protected function _afterLoad()
542542

543543
foreach ($this as $product) {
544544
if ($product->isRecurring() && $profile = $product->getRecurringProfile()) {
545-
$product->setRecurringProfile(unserialize($profile));
545+
$product->setRecurringProfile(Mage::helper('core/unserializeArray')->unserialize($profile));
546546
}
547547
}
548548

0 commit comments

Comments
 (0)