MAGETWO-70779: Add URL Rewrite not retrieving categories

 - CR changes

Author: Eric Bohanon

app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php

@@ -119,8 +119,6 @@ public function getTreeArray($parentId = null, $asJson = false, $recursionLevel
             $result = $this->_getNodesArray($this->getRoot(null, $recursionLevel));
         }
 
-        $result = $this->convertNameSingleQuote($result);
-
         if ($asJson) {
             return $this->_jsonEncoder->encode($result);
         }
@@ -163,7 +161,8 @@ protected function _getNodesArray($node)
             'parent_id' => (int)$node->getParentId(),
             'children_count' => (int)$node->getChildrenCount(),
             'is_active' => (bool)$node->getIsActive(),
-            'name' => $node->getName(),
+            // Scrub names for raw js output
+            'name' => $this->escapeHtml($node->getName()),
             'level' => (int)$node->getLevel(),
             'product_count' => (int)$node->getProductCount(),
         ];
@@ -184,27 +183,6 @@ protected function _getNodesArray($node)
         return $result;
     }
 
-    /**
-     * Scrubs category names of single quotes, replacing them with HTML Entity equivalent
-     *
-     * @param array $node
-     * @return array
-     */
-    private function convertNameSingleQuote($node)
-    {
-        if (!empty($node['name']) && strpos($node['name'], '\'') !== false) {
-            $node['name'] = str_replace('\'', ''', $node['name']);
-        }
-
-        // Recurse through all children
-        $childrenCount = !empty($node['children']) ? count($node['children']) : 0;
-        for ($i = 0; $i < $childrenCount; $i++) {
-            $node['children'][$i] = $this->convertNameSingleQuote($node['children'][$i]);
-        }
-
-        return $node;
-    }
-
     /**
      * Get URL for categories tree ajax loader
      *

dev/tests/integration/testsuite/Magento/Catalog/_files/indexer_catalog_category_with_apostrophe.php renamed to dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_apostrophe.php

@@ -46,17 +46,17 @@ public function testGetTreeArray()
     }
 
     /**
-     * Test that the getTree() method scrubs single quotes and apostrophes from names
+     * Test that the getTreeArray() method scrubs single quotes and apostrophes from names
      *
      * @magentoAppIsolation enabled
-     * @magentoDataFixture Magento/Catalog/_files/indexer_catalog_category_with_apostrophe.php
-     * @magentoDataFixture Magento/Catalog/_files/indexer_catalog_products.php
+     * @magentoDataFixture Magento/Catalog/_files/catalog_category_with_apostrophe.php
      */
     public function testGetTreeArrayApostropheReplaced()
     {
         $tree = $this->_treeBlock->getTreeArray();
 
-        $this->assertContains(''', $tree['children'][0]['children'][0]['children'][0]['name']);
+        $this->assertNotContains('\'', $tree['children'][0]['children'][0]['children'][0]['name']);
+        $this->assertEquals(''Category 6'', $tree['children'][0]['children'][0]['children'][0]['name']);
     }
 
     /**