Skip to content

Commit 6d9aa05

Browse files
magento-teammagento-team
committed
2.0.0.0-dev58
* Fixed bugs: * Security improved for the Login, Update Cart, Add to Compare, Review, and Add entire wishlist actions on the frontend * Removed warnings on category pages when Flat Catalog Category is enabled * Fixed product price displayed in wrong currency after switching currency on the frontend * Fixed the Save & Duplicate action in product creation * Fixed big image scaling in product description * Fixed admin dashboard styling issue * Fixed validation message for the Quantity field on the product page in the backend * Fixed the email template for sharing a Wishlist * Fixed the response of the drop-down menu in the Plushe theme * Fixed the missing Related Banners tab for Catalog Price Rule * Fixed inability to enable the duplicated product * Removed warnings on saving payment method configuration * Fixed gift messages displaying on the Order View page after admin edits * Fixed inability to create a new order status * Fixed the behavior of the Save and Previous and the Previous buttons on the Edit Review page * Fixed inability to delete a website if the number of websites is less or equal to two * Fixed Export on the All Customers page * Fixed inability to add products to the Shopping Cart from the Category page in Internet Explorer * Fixed logo on the backend login page * Fixed visual elements to indicate that Tax details can be expanded on the order creation page in the backend * Fixed the CMS page preview design * Fixed the newsletter template preview design * Fixed the Matched Customers grid design in the Email Reminder Rules * Fixed the theme version validation message displayed when creating a new theme * Fixed performance degradation during installation wizard execution * Fixed cron shell script * Fixed user login on the frontend, when the Redirect Customer to Account Dashboard after Logging option is set to No * Fixed errors in requests to shipping carrier (DHL International) when the shipping address contains letters with diacritic marks * Fixed invalid account creation date * Fixed displaying Product Alert links on product view page when the functionality is disabled * Fixed the absence of some bundle options when configuring a bundle product in the Shopping Cart on the frontend * Fixed the issue which allowed to view and cancel billing agreements belonging to another customer * Fixed the content spoofing vulnerability when Solr was used * Fixed a potential XSS vulnerability in customer login * Fixed RSS feed for categories containing bundle product(s) * Fixed inability to place an order with 3D Secure in Internet Explorer 10 * Fixed inability to place an order with PayPal Payflow Link and PayPal Payments Advanced * Fixed integrity constraint violation in catalog URL rewrites * Fixed the absence of the error when a wrong website code is specified during a website creation * Fixed saving in the backend a new customer address, which contains new customer address attributes configured to be not visible on frontend * Fixed USPS shipping method in the checkout * Fixed placing orders with recurring profile items via PayPal Express Checkout * Fixed email template creation in the backend * Fixed the issue with default billing address being used instead of default shipping address during admin order creation * Fixed inability to choose DB as Media Storage * Fixed PHP issues found during the UI testing of the backend * Fixed shipping label creation for USPS Priority Mail Shipping methods * Fixed the issue which allowed to create customers with duplicate email * Fixed the abstract product block error in the tier price template getter * Fixed system message displaying in the backend * Fixed the "404" error on customer review page * Fixed autocomplete enabled on the admin login page * Fixed the 3D Secure iframe * Fixed the indicators of mandatory fields on the Package Extension page * Fixed product image scaling on the Compare Products page * Fixed product page design for products with the Fixed Product Tax attribute * Removed spaces between parentheses and numbers in the Cart, Wishlist, and Compare Products blocks * Fixed the message displaying the quantity for products found on the Advanced Search page * Fixed incorrect caching of locale settings and URL settings during web installation * Fixed inability to use a newly created store for admin user roles * Fixed absence of the Advanced Search field on the frontend, when the Popular Search Terms functionality is disabled * Fixed incorrect link to downloadable product(s) in the email invoice copy * Fixed customs monetary value in labels/package info for international shipments * Fixed importing for files with blank URL Key field on the store view level * Fixed table rate error message * Fixed frontend login without pre-set cookies * Fixed date resetting to 1 Jan 1970 after saving a design change in the admin panel in case date format is DD/MM/YY * Fixed CAPTCHA on multi-address checkout flow * Fixed view files population tool * GitHub requests: * [#122](#122) -- Added support of federal units of Brazil with 27 states * [#184](#184) -- Removed unused blocks and methods in Magento_Wishlist module * [#390](#390) -- Support of alphanumeric order increment ids by the quote resource model * Themes update: * Responsive design improvements * Improvements in code coverage calculation: * Code coverage calculation approach for unit tests was changed from blacklist to whitelist
1 parent 69663a1 commit 6d9aa05

File tree

272 files changed

+5613
-1909
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

272 files changed

+5613
-1909
lines changed

‎CHANGELOG.md

+82-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,84 @@
1+
2.0.0.0-dev58
2+
=============
3+
* Fixed bugs:
4+
* Security improved for the Login, Update Cart, Add to Compare, Review, and Add entire wishlist actions on the frontend
5+
* Removed warnings on category pages when Flat Catalog Category is enabled
6+
* Fixed product price displayed in wrong currency after switching currency on the frontend
7+
* Fixed the Save & Duplicate action in product creation
8+
* Fixed big image scaling in product description
9+
* Fixed admin dashboard styling issue
10+
* Fixed validation message for the Quantity field on the product page in the backend
11+
* Fixed the email template for sharing a Wishlist
12+
* Fixed the response of the drop-down menu in the Plushe theme
13+
* Fixed the missing Related Banners tab for Catalog Price Rule
14+
* Fixed inability to enable the duplicated product
15+
* Removed warnings on saving payment method configuration
16+
* Fixed gift messages displaying on the Order View page after admin edits
17+
* Fixed inability to create a new order status
18+
* Fixed the behavior of the Save and Previous and the Previous buttons on the Edit Review page
19+
* Fixed inability to delete a website if the number of websites is less or equal to two
20+
* Fixed Export on the All Customers page
21+
* Fixed inability to add products to the Shopping Cart from the Category page in Internet Explorer
22+
* Fixed logo on the backend login page
23+
* Fixed visual elements to indicate that Tax details can be expanded on the order creation page in the backend
24+
* Fixed the CMS page preview design
25+
* Fixed the newsletter template preview design
26+
* Fixed the Matched Customers grid design in the Email Reminder Rules
27+
* Fixed the theme version validation message displayed when creating a new theme
28+
* Fixed performance degradation during installation wizard execution
29+
* Fixed cron shell script
30+
* Fixed user login on the frontend, when the Redirect Customer to Account Dashboard after Logging option is set to No
31+
* Fixed errors in requests to shipping carrier (DHL International) when the shipping address contains letters with diacritic marks
32+
* Fixed invalid account creation date
33+
* Fixed displaying Product Alert links on product view page when the functionality is disabled
34+
* Fixed the absence of some bundle options when configuring a bundle product in the Shopping Cart on the frontend
35+
* Fixed the issue which allowed to view and cancel billing agreements belonging to another customer
36+
* Fixed the content spoofing vulnerability when Solr was used
37+
* Fixed a potential XSS vulnerability in customer login
38+
* Fixed RSS feed for categories containing bundle product(s)
39+
* Fixed inability to place an order with 3D Secure in Internet Explorer 10
40+
* Fixed inability to place an order with PayPal Payflow Link and PayPal Payments Advanced
41+
* Fixed integrity constraint violation in catalog URL rewrites
42+
* Fixed the absence of the error when a wrong website code is specified during a website creation
43+
* Fixed saving in the backend a new customer address, which contains new customer address attributes configured to be not visible on frontend
44+
* Fixed USPS shipping method in the checkout
45+
* Fixed placing orders with recurring profile items via PayPal Express Checkout
46+
* Fixed email template creation in the backend
47+
* Fixed the issue with default billing address being used instead of default shipping address during admin order creation
48+
* Fixed inability to choose DB as Media Storage
49+
* Fixed PHP issues found during the UI testing of the backend
50+
* Fixed shipping label creation for USPS Priority Mail Shipping methods
51+
* Fixed the issue which allowed to create customers with duplicate email
52+
* Fixed the abstract product block error in the tier price template getter
53+
* Fixed system message displaying in the backend
54+
* Fixed the "404" error on customer review page
55+
* Fixed autocomplete enabled on the admin login page
56+
* Fixed the 3D Secure iframe
57+
* Fixed the indicators of mandatory fields on the Package Extension page
58+
* Fixed product image scaling on the Compare Products page
59+
* Fixed product page design for products with the Fixed Product Tax attribute
60+
* Removed spaces between parentheses and numbers in the Cart, Wishlist, and Compare Products blocks
61+
* Fixed the message displaying the quantity for products found on the Advanced Search page
62+
* Fixed incorrect caching of locale settings and URL settings during web installation
63+
* Fixed inability to use a newly created store for admin user roles
64+
* Fixed absence of the Advanced Search field on the frontend, when the Popular Search Terms functionality is disabled
65+
* Fixed incorrect link to downloadable product(s) in the email invoice copy
66+
* Fixed customs monetary value in labels/package info for international shipments
67+
* Fixed importing for files with blank URL Key field on the store view level
68+
* Fixed table rate error message
69+
* Fixed frontend login without pre-set cookies
70+
* Fixed date resetting to 1 Jan 1970 after saving a design change in the admin panel in case date format is DD/MM/YY
71+
* Fixed CAPTCHA on multi-address checkout flow
72+
* Fixed view files population tool
73+
* GitHub requests:
74+
* [#122](https://github.com/magento/magento2/pull/122) -- Added support of federal units of Brazil with 27 states
75+
* [#184](https://github.com/magento/magento2/issues/184) -- Removed unused blocks and methods in Magento_Wishlist module
76+
* [#390](https://github.com/magento/magento2/pull/390) -- Support of alphanumeric order increment ids by the quote resource model
77+
* Themes update:
78+
* Responsive design improvements
79+
* Improvements in code coverage calculation:
80+
* Code coverage calculation approach for unit tests was changed from blacklist to whitelist
81+
182
2.0.0.0-dev57
283
=============
384
* Fixed bugs:
@@ -44,7 +125,7 @@
44125
* Session generic wrapper moved to library
45126
* Messages functionality moved from the Session model as separate component, message manager interface created
46127
* Sid resolver interface created to handle session sid from request
47-
128+
48129
2.0.0.0-dev56
49130
=============
50131
* Fixed bugs:

‎app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml

+14-18
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,28 @@
2424
*/
2525
-->
2626
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
27-
<referenceBlock name="root">
28-
<container name="notifications" as="notifications" label="Notifications" after="header">
29-
<block class="Magento\AdminNotification\Block\System\Messages" name="system_messages" as="system_messages" before="-" template="Magento_AdminNotification::system/messages.phtml"/>
30-
<block class="Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup" name="unread_system_messages" as="unread_system_messages" after="system_messages" template="Magento_AdminNotification::system/messages/popup.phtml"/>
31-
<block class="Magento\AdminNotification\Block\Window" name="notification_window" as="notification_window" acl="Magento_AdminNotification::show_toolbar" template="notification/window.phtml"/>
32-
</container>
33-
<referenceBlock name="head">
34-
<block class="Magento\Theme\Block\Html\Head\Script" name="magento-adminnotification-system-notification-js">
35-
<arguments>
36-
<argument name="file" xsi:type="string">Magento_AdminNotification::system/notification.js</argument>
37-
</arguments>
38-
</block>
39-
</referenceBlock>
40-
</referenceBlock>
27+
<referenceContainer name="notifications">
28+
<block class="Magento\AdminNotification\Block\System\Messages" name="system_messages" as="system_messages" before="-" template="Magento_AdminNotification::system/messages.phtml"/>
29+
<block class="Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup" name="unread_system_messages" as="unread_system_messages" after="system_messages" template="Magento_AdminNotification::system/messages/popup.phtml"/>
30+
<block class="Magento\AdminNotification\Block\Window" name="notification_window" as="notification_window" acl="Magento_AdminNotification::show_toolbar" template="notification/window.phtml"/>
31+
</referenceContainer>
4132
<referenceBlock name="header">
4233
<block class="Magento\AdminNotification\Block\ToolbarEntry" template="toolbar_entry.phtml" before="-"/>
4334
</referenceBlock>
4435
<referenceBlock name="head">
45-
<block class="Magento\Theme\Block\Html\Head\Css" name="magento-core-prototype-magento-css">
36+
<block class="Magento\Theme\Block\Html\Head\Script" name="magento-adminnotification-toolbar-entry-js" after="jquery-jquery-js">
4637
<arguments>
47-
<argument name="file" xsi:type="string">Magento_Core::prototype/magento.css</argument>
38+
<argument name="file" xsi:type="string">Magento_AdminNotification::toolbar_entry.js</argument>
4839
</arguments>
4940
</block>
50-
<block class="Magento\Theme\Block\Html\Head\Script" name="magento-adminnotification-toolbar-entry-js">
41+
<block class="Magento\Theme\Block\Html\Head\Script" name="magento-adminnotification-system-notification-js" after="jquery-jquery-js">
5142
<arguments>
52-
<argument name="file" xsi:type="string">Magento_AdminNotification::toolbar_entry.js</argument>
43+
<argument name="file" xsi:type="string">Magento_AdminNotification::system/notification.js</argument>
44+
</arguments>
45+
</block>
46+
<block class="Magento\Theme\Block\Html\Head\Css" name="magento-core-prototype-magento-css">
47+
<arguments>
48+
<argument name="file" xsi:type="string">Magento_Core::prototype/magento.css</argument>
5349
</arguments>
5450
</block>
5551
</referenceBlock>

‎app/code/Magento/Authorizenet/view/frontend/directpost/form.phtml

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ $_orderUrl = $this->helper('Magento\Authorizenet\Helper\Data')->getPlaceOrderFro
5656
<div class="field required number">
5757
<label for="<?php echo $_code ?>_cc_number" class="label"><span><?php echo __('Credit Card Number') ?></span></label>
5858
<div class="control">
59-
<input type="text" id="<?php echo $_code ?>_cc_number" data-container="cc-number" name="payment[cc_number]" title="<?php echo __('Credit Card Number') ?>" class="input-text" value="" data-validate='{required:true, "validate-cc-number":"#<?php echo $_code ?>_cc_type", "validate-cc-type":"#<?php echo $_code ?>_cc_type"}' autocomplete="off"/>
59+
<input type="number" id="<?php echo $_code ?>_cc_number" data-container="cc-number" name="payment[cc_number]" title="<?php echo __('Credit Card Number') ?>" class="input-text" value="" data-validate='{required:true, "validate-cc-number":"#<?php echo $_code ?>_cc_type", "validate-cc-type":"#<?php echo $_code ?>_cc_type"}' autocomplete="off"/>
6060
</div>
6161
</div>
6262
<div class="field required date" id="<?php echo $_code ?>_cc_type_exp_div">
@@ -90,7 +90,7 @@ $_orderUrl = $this->helper('Magento\Authorizenet\Helper\Data')->getPlaceOrderFro
9090
<div class="field required cvv" id="<?php echo $_code ?>_cc_type_cvv_div">
9191
<label for="<?php echo $_code ?>_cc_cid" class="label"><span><?php echo __('Card Verification Number') ?></span></label>
9292
<div class="control">
93-
<input type="text" title="<?php echo __('Card Verification Number') ?>" data-container="cc-cvv" class="input-text cvv" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{required:true, "validate-cc-cvn":"#<?php echo $_code ?>_cc_type"}' autocomplete="off"/>
93+
<input type="number" title="<?php echo __('Card Verification Number') ?>" data-container="cc-cvv" class="input-text cvv" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{required:true, "validate-cc-cvn":"#<?php echo $_code ?>_cc_type"}' autocomplete="off"/>
9494
<div class="note">
9595
<a href="#" id="directpost-cvv-what-is-this" class="action cvv" data-mage-init='{toggleAdvanced: {toggleContainers:"#directpost-tool-tip"}}'><span><?php echo __('What is this?') ?></span></a>
9696
</div>

‎app/code/Magento/Backend/App/AbstractAction.php

-19
Original file line numberDiff line numberDiff line change
@@ -381,23 +381,4 @@ protected function _validateSecretKey()
381381
}
382382
return true;
383383
}
384-
385-
/**
386-
* Render specified template
387-
*
388-
* @param string $tplName
389-
* @param array $data parameters required by template
390-
*/
391-
protected function _outTemplate($tplName, $data = array())
392-
{
393-
$this->_view->getLayout()->initMessages();
394-
$block = $this->_view->getLayout()
395-
->createBlock('Magento\Backend\Block\Template')->setTemplate("{$tplName}.phtml");
396-
foreach ($data as $index => $value) {
397-
$block->assign($index, $value);
398-
}
399-
$html = $block->toHtml();
400-
$this->_objectManager->get('Magento\Core\Model\Translate')->processResponseBody($html);
401-
$this->getResponse()->setBody($html);
402-
}
403384
}

‎app/code/Magento/Backend/Controller/Adminhtml/System/Config/System/Storage.php

+6-4
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ public function synchronizeAction()
6464
{
6565
session_write_close();
6666

67-
if (!isset($_REQUEST['storage'])) {
67+
$requestStorage = $this->getRequest()->getParam('storage');
68+
$requestConnection = $this->getRequest()->getParam('connection');
69+
if (!isset($requestStorage)) {
6870
return;
6971
}
7072

@@ -80,9 +82,9 @@ public function synchronizeAction()
8082
->setFlagData(array())
8183
->save();
8284

83-
$storage = array('type' => (int) $_REQUEST['storage']);
84-
if (isset($_REQUEST['connection']) && !empty($_REQUEST['connection'])) {
85-
$storage['connection'] = $_REQUEST['connection'];
85+
$storage = array('type' => $requestStorage);
86+
if (isset($requestConnection) && !empty($requestConnection)) {
87+
$storage['connection'] = $requestConnection;
8688
}
8789

8890
try {

‎app/code/Magento/Backend/Controller/Adminhtml/System/Design.php

+27-2
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,23 @@ class Design extends \Magento\Backend\App\Action
3535
*/
3636
protected $_coreRegistry = null;
3737

38+
/**
39+
* @var \Magento\Core\Filter\Date
40+
*/
41+
protected $dateFilter;
42+
3843
/**
3944
* @param \Magento\Backend\App\Action\Context $context
4045
* @param \Magento\Core\Model\Registry $coreRegistry
46+
* @param \Magento\Core\Filter\Date $dateFilter
4147
*/
4248
public function __construct(
4349
\Magento\Backend\App\Action\Context $context,
44-
\Magento\Core\Model\Registry $coreRegistry
50+
\Magento\Core\Model\Registry $coreRegistry,
51+
\Magento\Core\Filter\Date $dateFilter
4552
) {
4653
$this->_coreRegistry = $coreRegistry;
54+
$this->dateFilter = $dateFilter;
4755
parent::__construct($context);
4856
}
4957

@@ -86,7 +94,9 @@ public function editAction()
8694
$this->_coreRegistry->register('design', $design);
8795

8896
$this->_addContent($this->_view->getLayout()->createBlock('Magento\Backend\Block\System\Design\Edit'));
89-
$this->_addLeft($this->_view->getLayout()->createBlock('Magento\Backend\Block\System\Design\Edit\Tabs', 'design_tabs'));
97+
$this->_addLeft(
98+
$this->_view->getLayout()->createBlock('Magento\Backend\Block\System\Design\Edit\Tabs', 'design_tabs')
99+
);
90100

91101
$this->_view->renderLayout();
92102
}
@@ -95,6 +105,7 @@ public function saveAction()
95105
{
96106
$data = $this->getRequest()->getPost();
97107
if ($data) {
108+
$data['design'] = $this->_filterPostData($data['design']);
98109
$id = (int) $this->getRequest()->getParam('id');
99110

100111
$design = $this->_objectManager->create('Magento\Core\Model\Design');
@@ -143,4 +154,18 @@ protected function _isAllowed()
143154
{
144155
return $this->_authorization->isAllowed('Magento_Adminhtml::design');
145156
}
157+
158+
/**
159+
* Filtering posted data. Converting localized data if needed
160+
*
161+
* @param array
162+
* @return array
163+
*/
164+
protected function _filterPostData($data)
165+
{
166+
$inputFilter = new \Zend_Filter_Input(
167+
array('date_from' => $this->dateFilter, 'date_to' => $this->dateFilter), array(), $data);
168+
$data = $inputFilter->getUnescaped();
169+
return $data;
170+
}
146171
}

‎app/code/Magento/Backend/Controller/Adminhtml/System/Store.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ public function saveAction()
255255
$this->_redirect('adminhtml/*/');
256256
return;
257257
} catch (\Magento\Core\Exception $e) {
258-
$this->messageManager->addMessages($e->getMessages());
258+
$this->messageManager->addError($e->getMessage());
259259
$this->_getSession()->setPostData($postData);
260260
} catch (\Exception $e) {
261261
$this->messageManager->addException($e, __('An error occurred while saving. Please review the error log.'));

‎app/code/Magento/Backend/Model/Auth/Session.php

+7
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@
2929
/**
3030
* Backend Auth session model
3131
*
32+
* @method \Magento\User\Model\User|null getUser()
33+
* @method \Magento\Backend\Model\Auth\Session setUser(\Magento\User\Model\User $value)
34+
* @method \Magento\Acl|null getAcl()
35+
* @method \Magento\Backend\Model\Auth\Session setAcl(\Magento\Acl $value)
36+
* @method int getUpdatedAt()
37+
* @method \Magento\Backend\Model\Auth\Session setUpdatedAt(int $value)
38+
*
3239
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
3340
* @todo implement solution that keeps is_first_visit flag in session during redirects
3441
*/

‎app/code/Magento/Backend/view/adminhtml/admin/login.phtml

+3-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<div id="messages" data-container-for="messages">
6969
<?php echo $this->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
7070
</div>
71-
<form method="post" action="" id="login-form">
71+
<form method="post" action="" id="login-form" autocomplete="off">
7272
<fieldset class="fieldset">
7373
<legend class="legend"><span><?php echo __('Welcome') ?></span></legend><br/>
7474
<input name="form_key" type="hidden" value="<?php echo $this->getFormKey() ?>" />
@@ -81,6 +81,8 @@
8181
<div class="field field-password">
8282
<label for="login" class="label"><?php echo __('Password:') ?></label>
8383
<div class="control">
84+
<!-- This is a dummy hidden field to trick firefox from auto filling the password -->
85+
<input type="text" class="input-text no-display" name="dummy" id="dummy" />
8486
<input type="password" id="login" name="login[password]" class="required-entry input-text" value="" placeholder="password" />
8587
</div>
8688
</div>

‎app/code/Magento/Backend/view/adminhtml/layout/default.xml

+1
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@
279279
<block class="Magento\Backend\Block\Page\Header" name="header" as="header">
280280
<block class="Magento\Backend\Block\GlobalSearch" as="search" acl="Magento_Adminhtml::global_search"/>
281281
</block>
282+
<container name="notifications" as="notifications" label="Notifications"/>
282283
<block class="Magento\Backend\Block\Widget\Breadcrumbs" name="breadcrumbs" as="breadcrumbs"/>
283284
<!--<update handle="formkey"/> this won't work, see the try/catch and a jammed exception in \Magento\Core\Model\Layout::createBlock() -->
284285
<block class="Magento\Backend\Block\Admin\Formkey" name="formkey" as="formkey" template="Magento_Backend::admin/formkey.phtml"/>

0 commit comments

Comments
 (0)