ACP2E-59: Importing Bundle with '?' in the option title corrupts how option is displayed and prevents product from being added to cart

Author: Chhandak.Barua

app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml

@@ -37,7 +37,7 @@ $_product = $block->getProduct();
                 <ul data-mage-init='{"productSummary": []}' class="bundle items"></ul>
                 <script data-template="bundle-summary" type="text/x-magento-template">
                     <li>
-                        <strong class="label v"><%= data._label_ %>:</strong>
+                        <strong class="label v"><%- data._label_ %>:</strong>
                         <div data-container="options"></div>
                     </li>
                 </script>

app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

@@ -183,7 +183,8 @@ protected function parseSelections($rowData, $entityId)
         );
         $selections = explode(
             Product::PSEUDO_MULTI_LINE_SEPARATOR,
-            str_replace('?', '?', $rowData['bundle_values'])
+            $rowData['bundle_values']
+            //str_replace('?', '?', $rowData['bundle_values'])
         );
         foreach ($selections as $selection) {
             $values = explode($this->_entityModel->getMultipleValueSeparator(), $selection);
@@ -199,11 +200,7 @@ protected function parseSelections($rowData, $entityId)
                     $this->_cachedOptions[$entityId][$option['name']]['selections'] = [];
                 }
                 $this->_cachedOptions[$entityId][$option['name']]['selections'][] = $option;
-                $this->_cachedOptionSelectQuery[] =
-                    $this->connection->quoteInto(
-                        '(parent_id = ' . (int)$entityId . ' AND title = ?)',
-                        $option['name']
-                    );
+                $this->_cachedOptionSelectQuery[] = 'parent_id =' . (int)$entityId . ' AND title =' . $option['name'];
             }
         }
         return $selections;
@@ -474,18 +471,25 @@ protected function transformBundleCustomAttributes($rowData)
      */
     protected function populateExistingOptions()
     {
-        $existingOptions = $this->connection->fetchAssoc(
-            $this->connection->select()->from(
-                ['bo' => $this->_resource->getTableName('catalog_product_bundle_option')],
-                ['option_id', 'parent_id', 'required', 'position', 'type']
-            )->joinLeft(
-                ['bov' => $this->_resource->getTableName('catalog_product_bundle_option_value')],
-                'bo.option_id = bov.option_id',
-                ['value_id', 'title']
-            )->where(
-                implode(' OR ', $this->_cachedOptionSelectQuery)
-            )
+        $select = $this->connection->select()->from(
+            ['bo' => $this->_resource->getTableName('catalog_product_bundle_option')],
+            ['option_id', 'parent_id', 'required', 'position', 'type']
+        )->joinLeft(
+            ['bov' => $this->_resource->getTableName('catalog_product_bundle_option_value')],
+            'bo.option_id = bov.option_id',
+            ['value_id', 'title']
         );
+        $orWhere = false;
+        foreach ($this->_cachedOptionSelectQuery as $item) {
+            $expItem = explode('=',$item);
+            if ($orWhere) {
+                $select->orWhere($expItem[0].' = '.$expItem[1].' = ?', $expItem[2]);
+            } else {
+                $select->where($expItem[0].' = '.$expItem[1].' = ?', $expItem[2]);
+                $orWhere = true;
+            }
+        }
+        $existingOptions = $this->connection->fetchAssoc($select);
         foreach ($existingOptions as $optionId => $option) {
             $this->_cachedOptions[$option['parent_id']][$option['title']]['option_id'] = $optionId;
             foreach ($option as $key => $value) {