117. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2024-03-04 14:38:49 +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.

117.1 Files compared

#LocationFileLast Modified
1/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme v4.0.7/app/design/frontend/Smartwave/porto/Magento_Catalog/templates/categorydesc_main_column.phtml2015-09-30 16:39:36 +0000
2/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme v4.0.8/app/design/frontend/Smartwave/porto/Magento_Catalog/templates/categorydesc_main_column.phtml2015-09-30 16:39:36 +0000

117.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged116
Changed00
Inserted00
Removed00

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

117.4 Active regular expressions

No regular expressions were active.

117.5 Comparison detail

1 <?php 1 <?php
2     $_category_desc = $this->helper('Smartwave\Porto\Helper\Data')->getConfig('porto_settings/category/category_description'); 2     $_category_desc = $this->helper('Smartwave\Porto\Helper\Data')->getConfig('porto_settings/category/category_description');
3 ?> 3 ?>
4 <?php if ($_category_desc == "main_column" && $_description = $block->getCurrentCategory()->getDescription()): ?> 4 <?php if ($_category_desc == "main_column" && $_description = $block->getCurrentCategory()->getDescription()): ?>
5     <div class="category-description"> 5     <div class="category-description">
6         <?php echo $this->helper('Magento\Catalog\Helper\Output')->categoryAttribute($block->getCurrentCategory(), $_description, 'description') ?> 6         <?php echo $this->helper('Magento\Catalog\Helper\Output')->categoryAttribute($block->getCurrentCategory(), $_description, 'description') ?>
7     </div> 7     </div>
8 <?php endif; ?> 8 <?php endif; ?>