77. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-07-21 10:21:59 +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.

77.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Catalog/templates/categorydescription.phtml2015-09-30 16:40:16 +0000
2/Applications/Ampps/www/Porto v4.0.1/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Catalog/templates/categorydescription.phtml2015-09-30 16:40:16 +0000

77.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged148
Changed00
Inserted00
Removed00

77.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

77.4 Active regular expressions

No regular expressions were active.

77.5 Comparison detail

1 <?php 1 <?php
2 /** 2 /**
3  * Copyright © 2015 Magento. All rights reserved. 3  * Copyright © 2015 Magento. All rights reserved.
4  * See COPYING.txt for license details. 4  * See COPYING.txt for license details.
5  */ 5  */
6  6 
7 // @codingStandardsIgnoreFile 7 // @codingStandardsIgnoreFile
8  8 
9 ?> 9 ?>
10 <?php 10 <?php
11 /** 11 /**
12  * Category view template 12  * Category view template
13  * 13  *
14  * @var $block \Magento\Catalog\Block\Category\View 14  * @var $block \Magento\Catalog\Block\Category\View
15  */ 15  */
16 ?> 16 ?>
17 <?php 17 <?php
18     $_category_desc = $this->helper('Smartwave\Porto\Helper\Data')->getConfig('porto_settings/category/category_description'); 18     $_category_desc = $this->helper('Smartwave\Porto\Helper\Data')->getConfig('porto_settings/category/category_description');
19 ?> 19 ?>
20 <?php if (!$_category_desc && $_description = $block->getCurrentCategory()->getDescription()): ?> 20 <?php if (!$_category_desc && $_description = $block->getCurrentCategory()->getDescription()): ?>
21     <div class="category-description"> 21     <div class="category-description">
22         <?php echo $this->helper('Magento\Catalog\Helper\Output')->categoryAttribute($block->getCurrentCategory(), $_description, 'description') ?> 22         <?php echo $this->helper('Magento\Catalog\Helper\Output')->categoryAttribute($block->getCurrentCategory(), $_description, 'description') ?>
23     </div> 23     </div>
24 <?php endif; ?> 24 <?php endif; ?>