diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php index f03d58b9a3eb7768459f884ff69e9fb447f3fc02..64038d17f14c64cee9a0cd01ef3bf2cfdccc05da 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php @@ -8,6 +8,13 @@ namespace Magento\Backend\Controller\Adminhtml\Noroute; class Index extends \Magento\Backend\App\Action { + /** + * Array of actions which can be processed without secret key validation + * + * @var string[] + */ + protected $_publicActions = ['index']; + /** * @var \Magento\Framework\View\Result\PageFactory */ diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml index 2f62315830308bdbe3bae28e39c2a3bbd1643909..4ea207dffae7fc9c936241a0a22824d7f88804df 100644 --- a/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml +++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml @@ -22,6 +22,12 @@ $_attributeLabel = $block->getAtLabel(); $_attributeType = $block->getAtType(); $_attributeAddAttribute = $block->getAddAttribute(); +$renderLabel = true; +// if defined as 'none' in layout, do not render +if ($_attributeLabel == 'none') { + $renderLabel = false; +} + if ($_attributeLabel && $_attributeLabel == 'default') { $_attributeLabel = $_product->getResource()->getAttribute($_code)->getStoreLabel(); } @@ -31,10 +37,9 @@ if ($_attributeType && $_attributeType == 'text') { $_attributeValue = $_helper->productAttribute($_product, $_product->$_call(), $_code); } ?> - <?php if ($_attributeValue): ?> <div class="product attribute <?= /* @escapeNotVerified */ $_className ?>"> - <?php if ($_attributeLabel != 'none'): ?><strong class="type"><?= /* @escapeNotVerified */ $_attributeLabel ?></strong><?php endif; ?> + <?php if ($renderLabel): ?><strong class="type"><?= /* @escapeNotVerified */ $_attributeLabel ?></strong><?php endif; ?> <div class="value" <?= /* @escapeNotVerified */ $_attributeAddAttribute ?>><?= /* @escapeNotVerified */ $_attributeValue ?></div> </div> <?php endif; ?> diff --git a/app/code/Magento/Cms/Model/ResourceModel/Block/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Block/Collection.php index 3c586a56d90cc1c12ae27b70580df056d142fc5e..f22367393030a12c68d86d7ae524f6589803d706 100644 --- a/app/code/Magento/Cms/Model/ResourceModel/Block/Collection.php +++ b/app/code/Magento/Cms/Model/ResourceModel/Block/Collection.php @@ -18,6 +18,20 @@ class Collection extends AbstractCollection */ protected $_idFieldName = 'block_id'; + /** + * Event prefix + * + * @var string + */ + protected $_eventPrefix = 'cms_block_collection'; + + /** + * Event object + * + * @var string + */ + protected $_eventObject = 'block_collection'; + /** * Perform operations after collection load * diff --git a/app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php index 7250eeaa47c0ee0b1932a4f2448e67e1b7cca14d..98c071890be46377bbd6c0a5d7622fed88e8abb1 100644 --- a/app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php +++ b/app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php @@ -25,6 +25,20 @@ class Collection extends AbstractCollection */ protected $_previewFlag; + /** + * Event prefix + * + * @var string + */ + protected $_eventPrefix = 'cms_page_collection'; + + /** + * Event object + * + * @var string + */ + protected $_eventObject = 'page_collection'; + /** * Define resource model *