63. Araxis Merge File Comparison Report

Produced by Araxis Merge on Fri Dec 13 16:40:55 2019 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

63.1 Files compared

#	Location	File	Last Modified
1	Porto v.3.2.1\Theme Files\Magento 1.x\Porto Theme\app\design\frontend\smartwave\porto\template\catalog\category	page_header.phtml	Sat Apr 22 03:34:30 2017 UTC
2	Porto v.3.2.2\Theme Files\Magento 1.x\Porto Theme\app\design\frontend\smartwave\porto\template\catalog\category	page_header.phtml	Fri Dec 13 13:07:02 2019 UTC

63.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	2	40
Changed	1	2
Inserted	0	0
Removed	0	0

63.3 Comparison options

Whitespace	All differences in whitespace within lines are ignored
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail

63.4 Active regular expressions

No regular expressions were active.

63.5 Comparison detail

1	<?php	1	<?php
2	$_help er = Ma ge::helper ('catalog/ output');	2	$_help er = Ma ge::helper ('catalog/ output');
3	$_cate gory = Ma ge::regist ry('curren t_category ');	3	$_cate gory = Ma ge::regist ry('curren t_category ');
4	$store = Mage::a pp()->getS tore();	4	$store = Mage::a pp()->getS tore();
5	$code = $store- >getCode() ;	5	$code = $store- >getCode() ;
6	if($_d escription =$_categor y->getDesc ription()) {	6	if($_d escription =$_categor y->getDesc ription()) {
7	if (Mage::get StoreConfi g("porto_s ettings/ca tegory/ful lwidth_des cription", $code)){	7	if (Mage::get StoreConfi g("porto_s ettings/ca tegory/ful lwidth_des cription", $code)){
8	?>	8	?>
9	<div class ="category -banner">	9	<div class ="category -banner">
10	<?php	10	<?php
11	ec ho $_helpe r->categor yAttribute ($_categor y, $_descr iption, 'd escription ');	11	ec ho $_helpe r->categor yAttribute ($_categor y, $_descr iption, 'd escription ');
12	?>	12	?>
13	</div>	13	</div>
14	<?php	14	<?php
15	}	15	}
16	}else if(Mage::g etStoreCon fig("porto _settings/ header/typ e",$code) == "10" \|\| Mage::getS toreConfig ("porto_se ttings/hea der/type", $code) == "17" \|\| Mage::getS toreConfig ("porto_se ttings/hea der/type", $code) == "22" ){	16	}else if(Mage::g etStoreCon fig("porto _settings/ header/typ e",$code) == "10" \|\| Mage::getS toreConfig ("porto_se ttings/hea der/type", $code) == "17" ){
17	?>	17	?>
18	<div class ="page-hea der">&nbsp ;</div>	18	<div class ="page-hea der">&nbsp ;</div>
19	<?php	19	<?php
20	}	20	}
21	?>	21	?>