Skip to content

Commit 911f460

Browse files
authored
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - #12957: [Backport to 2.3-develop] Fix #9243 - Upgrade ZF components. Zend_Service (by @dverkade) - #12943: Naming collision in Javascript ui registry (backend) (by @VladimirZaets) Fixed GitHub Issues: - #9243: Upgrade ZF components. Zend_Service (reported by @okorshenko) has been fixed in #12957 by @dverkade in 2.3-develop branch Related commits: 1. 68389d6 - #12555: Naming collision in Javascript ui registry (backend) (reported by @EliasZ) has been fixed in #12943 by @VladimirZaets in 2.3-develop branch Related commits: 1. 8580f45
2 parents 8d9dc65 + cc67343 commit 911f460

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,12 +357,12 @@ define([
357357
var element;
358358

359359
_.each(this.disabledAttributes, function (attribute) {
360-
registry.get('index = ' + attribute).disabled(false);
360+
registry.get('code = ' + attribute, 'index = ' + attribute).disabled(false);
361361
});
362362
this.disabledAttributes = [];
363363

364364
_.each(attributes, function (attribute) {
365-
element = registry.get('index = ' + attribute.code);
365+
element = registry.get('code = ' + attribute.code, 'index = ' + attribute.code);
366366

367367
if (!_.isUndefined(element)) {
368368
element.disabled(true);

lib/internal/Magento/Framework/CurrencyInterface.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,15 +239,19 @@ public function isLess($value, $currency = null);
239239
/**
240240
* Returns the set service class
241241
*
242-
* @return \Zend_Service
242+
* @return \Zend_Currency_CurrencyInterface
243+
* @deprecated
244+
* @see \Magento\Directory\Model\Currency\Import\ImportInterface
243245
*/
244246
public function getService();
245247

246248
/**
247249
* Sets a new exchange service
248250
*
249-
* @param string|\Magento\Framework\Locale\CurrencyInterface $service Service class
250-
* @return \Magento\Framework\CurrencyInterface
251+
* @param string|\Zend_Currency_CurrencyInterface $service Service class
252+
* @return \Zend_Currency_CurrencyInterface
253+
* @deprecated
254+
* @see \Magento\Directory\Model\Currency\Import\ImportInterface
251255
*/
252256
public function setService($service);
253257
}

0 commit comments

Comments
 (0)