Skip to content

Commit 2c98305

Browse files
undefined-olhaundefined-olha
committed
MAGETWO-55393: [Github #5636] Many storeviews break the page
- Merge remote-tracking branch 'origin' into MAGETWO-55393 - Conflicts: - app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml - app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
2 parents e5bee15 + 3bcc1c9 commit 2c98305

File tree

7,664 files changed

+103234
-50940
lines changed

Some content is hidden

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

7,664 files changed

+103234
-50940
lines changed

‎.htaccess

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -32,34 +32,6 @@
3232

3333
DirectoryIndex index.php
3434

35-
<IfModule mod_php5.c>
36-
37-
############################################
38-
## adjust memory limit
39-
40-
php_value memory_limit 768M
41-
php_value max_execution_time 18000
42-
43-
############################################
44-
## disable automatic session start
45-
## before autoload was initialized
46-
47-
php_flag session.auto_start off
48-
49-
############################################
50-
## enable resulting html compression
51-
52-
#php_flag zlib.output_compression on
53-
54-
###########################################
55-
## disable user agent verification to not break multiple image upload
56-
57-
php_flag suhosin.session.cryptua off
58-
59-
</IfModule>
60-
61-
<IfModule mod_php7.c>
62-
6335
############################################
6436
## adjust memory limit
6537

@@ -82,8 +54,6 @@
8254

8355
php_flag suhosin.session.cryptua off
8456

85-
</IfModule>
86-
8757
<IfModule mod_security.c>
8858
###########################################
8959
## disable POST processing to not break multiple image upload

‎.htaccess.sample

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -32,34 +32,6 @@
3232

3333
DirectoryIndex index.php
3434

35-
<IfModule mod_php5.c>
36-
37-
############################################
38-
## adjust memory limit
39-
40-
php_value memory_limit 768M
41-
php_value max_execution_time 18000
42-
43-
############################################
44-
## disable automatic session start
45-
## before autoload was initialized
46-
47-
php_flag session.auto_start off
48-
49-
############################################
50-
## enable resulting html compression
51-
52-
#php_flag zlib.output_compression on
53-
54-
###########################################
55-
## disable user agent verification to not break multiple image upload
56-
57-
php_flag suhosin.session.cryptua off
58-
59-
</IfModule>
60-
61-
<IfModule mod_php7.c>
62-
6335
############################################
6436
## adjust memory limit
6537

@@ -82,8 +54,6 @@
8254

8355
php_flag suhosin.session.cryptua off
8456

85-
</IfModule>
86-
8757
<IfModule mod_security.c>
8858
###########################################
8959
## disable POST processing to not break multiple image upload

‎.php_cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ return Symfony\CS\Config\Config::create()
3333
'extra_empty_lines',
3434
'include',
3535
'join_function',
36-
'multiline_array_trailing_comma',
3736
'namespace_no_leading_whitespace',
3837
'new_with_braces',
3938
'object_operator',

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function execute()
2222
$responseData = [];
2323
try {
2424
$this->_objectManager->create(
25-
'Magento\AdminNotification\Model\NotificationService'
25+
\Magento\AdminNotification\Model\NotificationService::class
2626
)->markAsRead(
2727
$notificationId
2828
);
@@ -31,7 +31,7 @@ public function execute()
3131
$responseData['success'] = false;
3232
}
3333
$this->getResponse()->representJson(
34-
$this->_objectManager->create('Magento\Framework\Json\Helper\Data')->jsonEncode($responseData)
34+
$this->_objectManager->create(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($responseData)
3535
);
3636
}
3737
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function execute()
2424
if ($notificationId) {
2525
try {
2626
$this->_objectManager->create(
27-
'Magento\AdminNotification\Model\NotificationService'
27+
\Magento\AdminNotification\Model\NotificationService::class
2828
)->markAsRead(
2929
$notificationId
3030
);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function execute()
2727
} else {
2828
try {
2929
foreach ($ids as $id) {
30-
$model = $this->_objectManager->create('Magento\AdminNotification\Model\Inbox')->load($id);
30+
$model = $this->_objectManager->create(\Magento\AdminNotification\Model\Inbox::class)->load($id);
3131
if ($model->getId()) {
3232
$model->setIsRead(1)->save();
3333
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function execute()
2727
} else {
2828
try {
2929
foreach ($ids as $id) {
30-
$model = $this->_objectManager->create('Magento\AdminNotification\Model\Inbox')->load($id);
30+
$model = $this->_objectManager->create(\Magento\AdminNotification\Model\Inbox::class)->load($id);
3131
if ($model->getId()) {
3232
$model->setIsRemove(1)->save();
3333
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Remove extends \Magento\AdminNotification\Controller\Adminhtml\Notificatio
2222
public function execute()
2323
{
2424
if ($id = $this->getRequest()->getParam('id')) {
25-
$model = $this->_objectManager->create('Magento\AdminNotification\Model\Inbox')->load($id);
25+
$model = $this->_objectManager->create(\Magento\AdminNotification\Model\Inbox::class)->load($id);
2626

2727
if (!$model->getId()) {
2828
$this->_redirect('adminhtml/*/');

‎app/code/Magento/AdminNotification/Model/Inbox.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierIn
3838
*/
3939
protected function _construct()
4040
{
41-
$this->_init('Magento\AdminNotification\Model\ResourceModel\Inbox');
41+
$this->_init(\Magento\AdminNotification\Model\ResourceModel\Inbox::class);
4242
}
4343

4444
/**

‎app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
1919
*/
2020
protected function _construct()
2121
{
22-
$this->_init('Magento\AdminNotification\Model\Inbox', 'Magento\AdminNotification\Model\ResourceModel\Inbox');
22+
$this->_init(
23+
\Magento\AdminNotification\Model\Inbox::class,
24+
\Magento\AdminNotification\Model\ResourceModel\Inbox::class
25+
);
2326
}
2427

2528
/**

0 commit comments

Comments
 (0)