214. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:02 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

214.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_CatalogSearch/templatesresult.phtml2019-03-29 03:16:32 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_CatalogSearch/templatesresult.phtml2021-05-01 02:36:42 +0000

214.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged636
Changed535
Inserted00
Removed00

214.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

214.4 Active regular expressions

No regular expressions were active.

214.5 Comparison detail

1 <?php 1 <?php
2 /** 2 /**
3  * Copyright © Magento, Inc. All rights reserved. 3  * Copyright © Magento, Inc. All rights reserved.
4  * See COPYING.txt for license details. 4  * See COPYING.txt for license details.
5  */ 5  */
6  6 
7 // @codingStandardsIgnoreFile 7 /** This changes need to valid applying filters and configuration before search process is started. */
8  8 $productList = $block->getProductListHtml();
9 ?> 9 ?>
10 <?php if ($block->getResultCount())
: ?>
 10 <?php if ($block->getResultCount()) : ?>
11 
<?= 
$block->getChildHtml('tagged_product_list_rss_link') ?>
 11     <?= /* @noEscape */ $block->getChildHtml('tagged_product_list_rss_link') ?>
12   <?php if ($messages = $block->getNoteMessages())
:
?>
 12 <div class="search results">
    13     <?php if ($messages = $block->getNoteMessages()) : ?>
13   <div class="message notice"> 14     <div class="message notice">
14       <div> 15         <div>
15           <?php foreach ($messages as $message)
:
?>
 16             <?php foreach ($messages as $message) : ?>
16               <?= /* @escapeNotVerified */ $message ?><br /> 17                 <?= /* @noEscape */ $message ?><br />
17           <?php endforeach;
?>
 18             <?php endforeach; ?>
18       </div> 19         </div>
19   </div> 20     </div>
20   <?php endif; ?> 21     <?php endif; ?>
21   <?= $block->getProductListHtml() ?> 22     <?= /* @noEscape */ $productList ?>
22 <?php else
: ?> 
 23 </div>
    24 <?php else : ?>
    25 
23 <div class="message notice"> 26 <div class="message notice">
24     <div> 27     <div>
25         <?= /* @escapeNotVerified */ ($block->getNoResultText()) ? $block->getNoResultText() : __('Your search returned no results.')
 ?>
 28         <?= $block->escapeHtml($block->getNoResultText()
 ? $block->getNoResultText() : __('Your search returned no results.')) ?>
26         <?= 
$block->getAdditionalHtml() ?>
 29         <?= /* @noEscape */ $block->getAdditionalHtml() ?>
27         <?php if ($messages = $block->getNoteMessages())
:
?>
 30         <?php if ($messages = $block->getNoteMessages()) : ?>
28             <?php foreach ($messages as $message)
:
?>
 31             <?php foreach ($messages as $message) : ?>
29                 <br /><?= /* @escapeNotVerified */ $message ?> 32                 <br /><?= /* @noEscape */ $message ?>
30             <?php endforeach;
?>
 33             <?php endforeach; ?>
31         <?php endif; ?> 34         <?php endif; ?>
32     </div> 35     </div>
33 </div> 36 </div>
34 <?php endif; ?> 37 <?php endif; ?>