Skip to content

Commit ecf5d27

Browse files
mazhalaimazhalai
committed
Merge remote-tracking branch 'mainlineCE/develop' into MAGETWO-44043-Wording-In-Readiness-Check
2 parents 8269a3a + c743dec commit ecf5d27

File tree

1,878 files changed

+13405
-8194
lines changed

Some content is hidden

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

1,878 files changed

+13405
-8194
lines changed

‎.htaccess

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,13 @@
129129

130130
</IfModule>
131131

132+
############################################
133+
## workaround for Apache 2.4.6 CentOS build when working via ProxyPassMatch with HHVM (or any other)
134+
## Please, set it on virtual host configuration level
135+
136+
## SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
137+
############################################
138+
132139
<IfModule mod_rewrite.c>
133140

134141
############################################

‎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/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AjaxMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Not
1313
*
1414
* @return void
1515
*/
16-
public function execute()
16+
public function executeInternal()
1717
{
1818
if (!$this->getRequest()->getPostValue()) {
1919
return;

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification
1111
/**
1212
* @return void
1313
*/
14-
public function execute()
14+
public function executeInternal()
1515
{
1616
$this->_view->loadLayout();
1717
$this->_setActiveMenu(

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class MarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notific
1111
/**
1212
* @return void
1313
*/
14-
public function execute()
14+
public function executeInternal()
1515
{
1616
$notificationId = (int)$this->getRequest()->getParam('id');
1717
if ($notificationId) {

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class MassMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Not
1111
/**
1212
* @return void
1313
*/
14-
public function execute()
14+
public function executeInternal()
1515
{
1616
$ids = $this->getRequest()->getParam('notification');
1717
if (!is_array($ids)) {

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class MassRemove extends \Magento\AdminNotification\Controller\Adminhtml\Notific
1111
/**
1212
* @return void
1313
*/
14-
public function execute()
14+
public function executeInternal()
1515
{
1616
$ids = $this->getRequest()->getParam('notification');
1717
if (!is_array($ids)) {

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Remove extends \Magento\AdminNotification\Controller\Adminhtml\Notificatio
1111
/**
1212
* @return void
1313
*/
14-
public function execute()
14+
public function executeInternal()
1515
{
1616
if ($id = $this->getRequest()->getParam('id')) {
1717
$model = $this->_objectManager->create('Magento\AdminNotification\Model\Inbox')->load($id);

‎app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function __construct(
3838
/**
3939
* @return void
4040
*/
41-
public function execute()
41+
public function executeInternal()
4242
{
4343
$severity = $this->getRequest()->getParam('severity');
4444
if ($severity) {

‎app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/SuccessTest.php

Lines changed: 0 additions & 101 deletions
This file was deleted.

0 commit comments

Comments
 (0)