MAGETWO-56444: UI-Related Modules Template Update

- Corrected theme and ui module templates

Author: Hwashiang Yu

app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml

@@ -11,7 +11,7 @@
     <span class="fileinput-button form-buttons">
         <span><?= $block->escapeHtml(__('Browse Files')) ?></span>
         <input id="fileupload" type="file" name="<?= $block->escapeHtmlAttr($block->getConfig()->getFileField()) ?>"
-            data-url="<?= $block->escapeHtmlAttr($block->getConfig()->getUrl()) ?>" multiple>
+            data-url="<?= $block->escapeHtmlAttr($block->escapeUrl($block->getConfig()->getUrl())) ?>" multiple>
     </span>
     <div class="clear"></div>
     <script id="<?= $block->getHtmlId() ?>-template" type="text/x-magento-template">

app/code/Magento/Theme/view/frontend/templates/html/sections.phtml

@@ -5,7 +5,7 @@
  */
 
 /**
-*  General template for displaying group of blocks devided into sections
+*  General template for displaying group of blocks divided into sections
 */
 
 $group = $block->getGroupName();
@@ -28,7 +28,7 @@ $groupBehavior = $block->getGroupBehaviour() ? $block->getGroupBehaviour() : '{"
                 <div class="section-item-title <?= $block->escapeHtmlAttr($groupCss) ?>-item-title" data-role="collapsible">
                     <a class="<?= $block->escapeHtmlAttr($groupCss) ?>-item-switch" data-toggle="switch" href="#<?= $block->escapeHtmlAttr($alias) ?>"><?= $block->escapeHtml($label) ?></a>
                 </div>
-                <div class="section-item-content <?= $block->escapeHtmlAttr($groupCss) ?>-item-content" id="<?= $block->escapeHtmlAttr($alias) ?>" data-role="content"><?= $block->escapeHtml($html) ?></div>
+                <div class="section-item-content <?= $block->escapeHtmlAttr($groupCss) ?>-item-content" id="<?= $block->escapeHtmlAttr($alias) ?>" data-role="content"><?= /* @noEscape */ $html ?></div>
             <?php endforeach;?>
         </div>
     </div>

app/code/Magento/Theme/view/frontend/templates/html/title.phtml

@@ -8,23 +8,23 @@
  * @var $block \Magento\Theme\Block\Html\Title
  */
 $cssClass = $block->getCssClass() ? ' ' . $block->getCssClass() : '';
-$title = '';
+$titleHtml = '';
 if (trim($block->getPageHeading())) {
-    $title = '<span class="base" data-ui-id="page-title-wrapper" '
+    $titleHtml = '<span class="base" data-ui-id="page-title-wrapper" '
         . $block->getAddBaseAttribute()
         . '>'
         . $block->escapeHtml($block->getPageHeading())
         . '</span>';
 }
 ?>
-<?php if ($title): ?>
+<?php if ($titleHtml): ?>
 <div class="page-title-wrapper<?= $block->escapeHtmlAttr($cssClass) ?>">
     <h1 class="page-title"
         <?php if ($block->getId()): ?> id="<?= $block->escapeHtmlAttr($block->getId()) ?>" <?php endif; ?>
         <?php if ($block->getAddBaseAttributeAria()): ?>
             aria-labelledby="<?= $block->escapeHtmlAttr($block->getAddBaseAttributeAria()) ?>"
         <?php endif; ?>>
-        <?= $block->escapeHtml($title) ?>
+        <?= /* @noEscape */ $titleHtml ?>
     </h1>
     <?= $block->getChildHtml() ?>
 </div>

app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml

@@ -11,12 +11,12 @@
  */
 
 $columnsLimit = $block->getColumnsLimit() ?: 0;
-$_menu = $block->getHtml('level-top', 'submenu', $columnsLimit)
+$_menuHtml = $block->getHtml('level-top', 'submenu', $columnsLimit)
 ?>
 
 <nav class="navigation" data-action="navigation">
     <ul data-mage-init='{"menu":{"responsive":true, "expanded":true, "position":{"my":"left top","at":"left bottom"}}}'>
-        <?= $block->escapeHtml($_menu)?>
+        <?= /* @noEscape */ $_menuHtml?>
         <?= $block->getChildHtml() ?>
     </ul>
 </nav>

app/code/Magento/Ui/view/base/templates/control/button/default.phtml

@@ -9,7 +9,7 @@
  */
 ?>
 <?= $block->getBeforeHtml() ?>
-<button <?= $block->escapeHtmlAttr($block->getAttributesHtml(), $block->getUiId()) ?>>
+<button <?= $block->escapeHtmlAttr($block->getAttributesHtml()), $block->escapeHtmlAttr($block->getUiId()) ?>>
     <span><?= $block->escapeHtml($block->getLabel()) ?></span>
 </button>
 <?= $block->getAfterHtml() ?>