Skip to content

Commit de54228

Browse files
author
Dmytro Voskoboinikov
committed
Merge branch 'MAGETWO-44627' into MAGETWO-44741
2 parents e952481 + f8a635a commit de54228

File tree

83 files changed

+870
-159
lines changed

Some content is hidden

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

83 files changed

+870
-159
lines changed

‎app/bootstrap.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,15 @@
3131
require_once __DIR__ . '/autoload.php';
3232
require_once BP . '/app/functions.php';
3333

34-
if (!empty($_SERVER['MAGE_PROFILER'])) {
35-
\Magento\Framework\Profiler::applyConfig($_SERVER['MAGE_PROFILER'], BP, !empty($_REQUEST['isAjax']));
34+
if (!empty($_SERVER['MAGE_PROFILER'])
35+
&& isset($_SERVER['HTTP_ACCEPT'])
36+
&& strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false
37+
) {
38+
\Magento\Framework\Profiler::applyConfig(
39+
$_SERVER['MAGE_PROFILER'],
40+
BP,
41+
!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'
42+
);
3643
}
3744
if (ini_get('date.timezone') == '') {
3845
date_default_timezone_set('UTC');

‎app/code/Magento/Catalog/etc/product_options_merged.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
9-
<xs:redefine schemaLocation="product_options.xsd">
9+
<xs:redefine schemaLocation="urn:magento:module:Magento_Catalog:etc/product_options.xsd">
1010
<xs:complexType name="optionDeclaration">
1111
<xs:complexContent>
1212
<xs:restriction base="optionDeclaration">

‎app/code/Magento/Catalog/etc/product_types.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
9-
<xs:include schemaLocation="product_types_base.xsd" />
9+
<xs:include schemaLocation="urn:magento:module:Magento_Catalog:etc/product_types_base.xsd" />
1010

1111
<xs:element name="config">
1212
<xs:complexType>

‎app/code/Magento/Catalog/etc/product_types_merged.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
99

10-
<xs:include schemaLocation="product_types_base.xsd" />
10+
<xs:include schemaLocation="urn:magento:module:Magento_Catalog:etc/product_types_base.xsd" />
1111

1212
<xs:element name="config">
1313
<xs:complexType>

‎app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Ui/etc/ui_configuration.xsd">
8+
<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
99
<argument name="data" xsi:type="array">
1010
<item name="js_config" xsi:type="array">
1111
<item name="provider" xsi:type="string">product_listing.product_listing_data_source</item>

‎app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Ui/etc/ui_configuration.xsd">
8+
<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
99
<columns name="product_columns" class="Magento\Catalog\Ui\Component\Listing\Columns">
1010
<column name="qty">
1111
<argument name="data" xsi:type="array">

‎app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Ui/etc/ui_configuration.xsd">
8+
<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
99
<argument name="data" xsi:type="array">
1010
<item name="js_config" xsi:type="array">
1111
<item name="provider" xsi:type="string">cms_block_listing.cms_block_listing_data_source</item>

‎app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Ui/etc/ui_configuration.xsd">
8+
<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
99
<argument name="data" xsi:type="array">
1010
<item name="js_config" xsi:type="array">
1111
<item name="provider" xsi:type="string">cms_page_listing.cms_page_listing_data_source</item>

‎app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,38 +33,31 @@ class AfterCustomUrlChangedObserver implements ObserverInterface
3333
*/
3434
protected $_response;
3535

36-
/**
37-
* @var \Magento\Store\Model\StoreManagerInterface
38-
*/
39-
protected $_storeManager;
40-
4136
/**
4237
* @param \Magento\Backend\Helper\Data $backendData
4338
* @param \Magento\Framework\Registry $coreRegistry
4439
* @param \Magento\Backend\Model\Auth\Session $authSession
4540
* @param \Magento\Framework\App\ResponseInterface $response
46-
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
4741
*/
4842
public function __construct(
4943
\Magento\Backend\Helper\Data $backendData,
5044
\Magento\Framework\Registry $coreRegistry,
5145
\Magento\Backend\Model\Auth\Session $authSession,
52-
\Magento\Framework\App\ResponseInterface $response,
53-
\Magento\Store\Model\StoreManagerInterface $storeManager
46+
\Magento\Framework\App\ResponseInterface $response
5447
) {
5548
$this->_backendData = $backendData;
5649
$this->_coreRegistry = $coreRegistry;
5750
$this->_authSession = $authSession;
5851
$this->_response = $response;
59-
$this->_storeManager = $storeManager;
6052
}
6153

6254
/**
63-
* Log out user and redirect him to new admin custom url
55+
* Log out user and redirect to new admin custom url
6456
*
6557
* @param \Magento\Framework\Event\Observer $observer
6658
* @return void
6759
* @SuppressWarnings(PHPMD.ExitExpression)
60+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
6861
*/
6962
public function execute(\Magento\Framework\Event\Observer $observer)
7063
{
@@ -73,10 +66,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
7366
}
7467

7568
$this->_authSession->destroy();
76-
77-
$route = $this->_backendData->getAreaFrontName();
78-
79-
$this->_response->setRedirect($this->_storeManager->getStore()->getBaseUrl() . $route)->sendResponse();
69+
$adminUrl = $this->_backendData->getHomePageUrl();
70+
$this->_response->setRedirect($adminUrl)->sendResponse();
8071
exit(0);
8172
}
8273
}

‎app/code/Magento/Config/etc/system_include.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
9-
<xs:include schemaLocation="system_file.xsd"/>
9+
<xs:include schemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd"/>
1010
<xs:element name="include" type="include" />
1111
<xs:complexType name="include">
1212
<xs:group minOccurs="1" maxOccurs="unbounded" ref="insertNodes"/>

0 commit comments

Comments
 (0)