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.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | Porto v.3.2.1\Theme Files\Magento 1.x\Porto Theme\app\code\local\Smartwave\Porto\Model\System\Config\Source\Setting\Installation | Demoversion.php | Fri Nov 8 18:20:54 2019 UTC |
| 2 | Porto v.3.2.2\Theme Files\Magento 1.x\Porto Theme\app\code\local\Smartwave\Porto\Model\System\Config\Source\Setting\Installation | Demoversion.php | Fri Dec 13 13:04:52 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 70 |
| Changed | 1 | 7 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| 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 |
No regular expressions were active.
| 1 | <?php | 1 | <?php | |||
| 2 | 2 | |||||
| 3 | class Smar twave_Port o_Model_Sy stem_Confi g_Source_S etting_Ins tallation_ Demoversio n | 3 | class Smar twave_Port o_Model_Sy stem_Confi g_Source_S etting_Ins tallation_ Demoversio n | |||
| 4 | { | 4 | { | |||
| 5 | public function toOptionAr ray() | 5 | public function toOptionAr ray() | |||
| 6 | { | 6 | { | |||
| 7 | re turn array ( | 7 | re turn array ( | |||
| 8 | array('v alue' => ' 0', 'label ' => Mage: :helper('p orto')->__ ('All')), | 8 | array('v alue' => ' 0', 'label ' => Mage: :helper('p orto')->__ ('All')), | |||
| 9 | array('v alue' => ' demo01', ' label' => Mage::help er('porto' )->__('Dem o 1')), | 9 | array('v alue' => ' demo01', ' label' => Mage::help er('porto' )->__('Dem o 1')), | |||
| 10 | array('v alue' => ' demo02', ' label' => Mage::help er('porto' )->__('Dem o 2')), | 10 | array('v alue' => ' demo02', ' label' => Mage::help er('porto' )->__('Dem o 2')), | |||
| 11 | array('v alue' => ' demo03', ' label' => Mage::help er('porto' )->__('Dem o 3')), | 11 | array('v alue' => ' demo03', ' label' => Mage::help er('porto' )->__('Dem o 3')), | |||
| 12 | array('v alue' => ' demo04', ' label' => Mage::help er('porto' )->__('Dem o 4')), | 12 | array('v alue' => ' demo04', ' label' => Mage::help er('porto' )->__('Dem o 4')), | |||
| 13 | array('v alue' => ' demo05', ' label' => Mage::help er('porto' )->__('Dem o 5')), | 13 | array('v alue' => ' demo05', ' label' => Mage::help er('porto' )->__('Dem o 5')), | |||
| 14 | array('v alue' => ' demo06', ' label' => Mage::help er('porto' )->__('Dem o 6')), | 14 | array('v alue' => ' demo06', ' label' => Mage::help er('porto' )->__('Dem o 6')), | |||
| 15 | array('v alue' => ' demo07', ' label' => Mage::help er('porto' )->__('Dem o 7')), | 15 | array('v alue' => ' demo07', ' label' => Mage::help er('porto' )->__('Dem o 7')), | |||
| 16 | array('v alue' => ' demo08', ' label' => Mage::help er('porto' )->__('Dem o 8')), | 16 | array('v alue' => ' demo08', ' label' => Mage::help er('porto' )->__('Dem o 8')), | |||
| 17 | array('v alue' => ' demo09', ' label' => Mage::help er('porto' )->__('Dem o 9')), | 17 | array('v alue' => ' demo09', ' label' => Mage::help er('porto' )->__('Dem o 9')), | |||
| 18 | array('v alue' => ' demo10', ' label' => Mage::help er('porto' )->__('Dem o 10')), | 18 | array('v alue' => ' demo10', ' label' => Mage::help er('porto' )->__('Dem o 10')), | |||
| 19 | array('v alue' => ' demo11', ' label' => Mage::help er('porto' )->__('Dem o 11')), | 19 | array('v alue' => ' demo11', ' label' => Mage::help er('porto' )->__('Dem o 11')), | |||
| 20 | array('v alue' => ' demo12', ' label' => Mage::help er('porto' )->__('Dem o 12')), | 20 | array('v alue' => ' demo12', ' label' => Mage::help er('porto' )->__('Dem o 12')), | |||
| 21 | array('v alue' => ' demo13', ' label' => Mage::help er('porto' )->__('Dem o 13')), | 21 | array('v alue' => ' demo13', ' label' => Mage::help er('porto' )->__('Dem o 13')), | |||
| 22 | array('v alue' => ' demo14', ' label' => Mage::help er('porto' )->__('Dem o 14')), | 22 | array('v alue' => ' demo14', ' label' => Mage::help er('porto' )->__('Dem o 14')), | |||
| 23 | array('v alue' => ' demo15', ' label' => Mage::help er('porto' )->__('Dem o 15')), | 23 | array('v alue' => ' demo15', ' label' => Mage::help er('porto' )->__('Dem o 15')), | |||
| 24 | array('v alue' => ' demo16', ' label' => Mage::help er('porto' )->__('Dem o 16')), | 24 | array('v alue' => ' demo16', ' label' => Mage::help er('porto' )->__('Dem o 16')), | |||
| 25 | array('v alue' => ' demo17', ' label' => Mage::help er('porto' )->__('Dem o 17')), | 25 | array('v alue' => ' demo17', ' label' => Mage::help er('porto' )->__('Dem o 17')), | |||
| 26 | array('v alue' => ' demo18', ' label' => Mage::help er('porto' )->__('Dem o 18')), | 26 | array('v alue' => ' demo18', ' label' => Mage::help er('porto' )->__('Dem o 18')), | |||
| 27 | array('v alue' => ' demo19', ' label' => Mage::help er('porto' )->__('Dem o 19')), | 27 | array('v alue' => ' demo19', ' label' => Mage::help er('porto' )->__('Dem o 19')), | |||
| 28 | array('v alue' => ' demo20', ' label' => Mage::help er('porto' )->__('Dem o 20')), | 28 | array('v alue' => ' demo20', ' label' => Mage::help er('porto' )->__('Dem o 20')), | |||
| 29 | array('v alue' => ' demo21', ' label' => Mage::help er('porto' )->__('Dem o 21')), | 29 | array('v alue' => ' demo21', ' label' => Mage::help er('porto' )->__('Dem o 21')), | |||
| 30 | array('v alue' => ' demo22', ' label' => Mage::help er('porto' )->__('Dem o 22')), | 30 | array('v alue' => ' demo22', ' label' => Mage::help er('porto' )->__('Dem o 22')), | |||
| 31 | array('v alue' => ' demo23', ' label' => Mage::help er('porto' )->__('Dem o 23')), | 31 | array('v alue' => ' demo23', ' label' => Mage::help er('porto' )->__('Dem o 23')), | |||
| 32 | array('v alue' => ' demo24', ' label' => Mage::help er('porto' )->__('Dem o 24')), | 32 | array('v alue' => ' demo24', ' label' => Mage::help er('porto' )->__('Dem o 24')), | |||
| 33 |
array('val
ue'
=>
'demo25',
'label'
=>
Mage::help
er('porto'
)->__('Dem
o
25'))
|
33 | array('val ue' => 'demo25', 'label' => Mage::help er('porto' )->__('Dem o 25')) , | |||
| 34 | array('v alue' => ' demo26', ' label' => Mage::help er('porto' )->__('Dem o 26')), | |||||
| 35 | array('v alue' => ' demo27', ' label' => Mage::help er('porto' )->__('Dem o 27')), | |||||
| 36 | array('v alue' => ' demo28', ' label' => Mage::help er('porto' )->__('Dem o 28')), | |||||
| 37 | array('v alue' => ' demo29', ' label' => Mage::help er('porto' )->__('Dem o 29')), | |||||
| 38 | array('v alue' => ' demo30', ' label' => Mage::help er('porto' )->__('Dem o 30')) | |||||
| 34 | ); | 39 | ); | |||
| 35 | } | 40 | } | |||
| 36 | } | 41 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2010 Araxis Ltd (www.araxis.com). All rights reserved.