Skip to content

Commit 7548b06

Browse files
author
Korshenko, Olexii(okorshenko)
committed
Merge pull request #719 from magento-api/API-Bug-Fixes
[API] Bug Fixes
2 parents 06732c3 + def0b78 commit 7548b06

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
?>
1010
<?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
1111

12-
<div id="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
12+
<div style="display:none" id="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
1313
<ul class="message-system-list">
1414
<?php foreach ($block->getUnreadMessages() as $message): ?>
1515
<li class="message message-warning <?php /* @escapeNotVerified */ echo $block->getItemClass($message);?>">

setup/src/Magento/Setup/Module/I18n/FilesCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected function _getIterator($path, $fileMask = false)
4242
try {
4343
$directoryIterator = new \RecursiveDirectoryIterator(
4444
$path,
45-
\FilesystemIterator::SKIP_DOTS | \FilesystemIterator::UNIX_PATHS
45+
\FilesystemIterator::SKIP_DOTS | \FilesystemIterator::UNIX_PATHS | \FilesystemIterator::FOLLOW_SYMLINKS
4646
);
4747
$iterator = new \RecursiveIteratorIterator($directoryIterator);
4848
} catch (\UnexpectedValueException $valueException) {

0 commit comments

Comments
 (0)