Skip to content

Commit cc66435

Browse files
rohit053rohit053
committed
v1.4.0 merge conflict resolved
2 parents 4159fe8 + b5d5bd7 commit cc66435

File tree

3,433 files changed

+95121
-73671
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,433 files changed

+95121
-73671
lines changed

‎Adapter/Adapter_AddressFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* 2007-2015 PrestaShop
3+
* 2007-2017 PrestaShop
44
*
55
* NOTICE OF LICENSE
66
*
@@ -19,7 +19,7 @@
1919
* needs please refer to http://www.prestashop.com for more information.
2020
*
2121
* @author PrestaShop SA <contact@prestashop.com>
22-
* @copyright 2007-2015 PrestaShop SA
22+
* @copyright 2007-2017 PrestaShop SA
2323
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2424
* International Registered Trademark & Property of PrestaShop SA
2525
*/

‎Adapter/Adapter_CacheManager.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* 2007-2015 PrestaShop
3+
* 2007-2017 PrestaShop
44
*
55
* NOTICE OF LICENSE
66
*
@@ -19,7 +19,7 @@
1919
* needs please refer to http://www.prestashop.com for more information.
2020
*
2121
* @author PrestaShop SA <contact@prestashop.com>
22-
* @copyright 2007-2015 PrestaShop SA
22+
* @copyright 2007-2017 PrestaShop SA
2323
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2424
* International Registered Trademark & Property of PrestaShop SA
2525
*/

‎Adapter/Adapter_Configuration.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* 2007-2015 PrestaShop
3+
* 2007-2017 PrestaShop
44
*
55
* NOTICE OF LICENSE
66
*
@@ -19,7 +19,7 @@
1919
* needs please refer to http://www.prestashop.com for more information.
2020
*
2121
* @author PrestaShop SA <contact@prestashop.com>
22-
* @copyright 2007-2015 PrestaShop SA
22+
* @copyright 2007-2017 PrestaShop SA
2323
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2424
* International Registered Trademark & Property of PrestaShop SA
2525
*/

‎Adapter/Adapter_Database.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* 2007-2015 PrestaShop
3+
* 2007-2017 PrestaShop
44
*
55
* NOTICE OF LICENSE
66
*
@@ -19,7 +19,7 @@
1919
* needs please refer to http://www.prestashop.com for more information.
2020
*
2121
* @author PrestaShop SA <contact@prestashop.com>
22-
* @copyright 2007-2015 PrestaShop SA
22+
* @copyright 2007-2017 PrestaShop SA
2323
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2424
* International Registered Trademark & Property of PrestaShop SA
2525
*/

‎Adapter/Adapter_EntityMapper.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* 2007-2015 PrestaShop
3+
* 2007-2017 PrestaShop
44
*
55
* NOTICE OF LICENSE
66
*
@@ -19,7 +19,7 @@
1919
* needs please refer to http://www.prestashop.com for more information.
2020
*
2121
* @author PrestaShop SA <contact@prestashop.com>
22-
* @copyright 2007-2015 PrestaShop SA
22+
* @copyright 2007-2017 PrestaShop SA
2323
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2424
* International Registered Trademark & Property of PrestaShop SA
2525
*/

‎Adapter/Adapter_EntityMetaDataRetriever.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* 2007-2015 PrestaShop
3+
* 2007-2017 PrestaShop
44
*
55
* NOTICE OF LICENSE
66
*
@@ -19,7 +19,7 @@
1919
* needs please refer to http://www.prestashop.com for more information.
2020
*
2121
* @author PrestaShop SA <contact@prestashop.com>
22-
* @copyright 2007-2015 PrestaShop SA
22+
* @copyright 2007-2017 PrestaShop SA
2323
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2424
* International Registered Trademark & Property of PrestaShop SA
2525
*/

‎Adapter/Adapter_Exception.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* 2007-2015 PrestaShop
3+
* 2007-2017 PrestaShop
44
*
55
* NOTICE OF LICENSE
66
*
@@ -19,7 +19,7 @@
1919
* needs please refer to http://www.prestashop.com for more information.
2020
*
2121
* @author PrestaShop SA <contact@prestashop.com>
22-
* @copyright 2007-2015 PrestaShop SA
22+
* @copyright 2007-2017 PrestaShop SA
2323
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2424
* International Registered Trademark & Property of PrestaShop SA
2525
*/

‎Adapter/Adapter_HookManager.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* 2007-2015 PrestaShop
3+
* 2007-2017 PrestaShop
44
*
55
* NOTICE OF LICENSE
66
*
@@ -19,7 +19,7 @@
1919
* needs please refer to http://www.prestashop.com for more information.
2020
*
2121
* @author PrestaShop SA <contact@prestashop.com>
22-
* @copyright 2007-2015 PrestaShop SA
22+
* @copyright 2007-2017 PrestaShop SA
2323
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2424
* International Registered Trademark & Property of PrestaShop SA
2525
*/

‎Adapter/Adapter_PackItemsManager.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* 2007-2015 PrestaShop
3+
* 2007-2017 PrestaShop
44
*
55
* NOTICE OF LICENSE
66
*
@@ -19,7 +19,7 @@
1919
* needs please refer to http://www.prestashop.com for more information.
2020
*
2121
* @author PrestaShop SA <contact@prestashop.com>
22-
* @copyright 2007-2015 PrestaShop SA
22+
* @copyright 2007-2017 PrestaShop SA
2323
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2424
* International Registered Trademark & Property of PrestaShop SA
2525
*/
@@ -41,7 +41,7 @@ public function getPackItems($pack, $id_lang = false)
4141
}
4242
return Pack::getItems($pack->id, $id_lang);
4343
}
44-
44+
4545
/**
4646
* Get all Packs that contains the given item in the corresponding declination.
4747
*
@@ -58,7 +58,7 @@ public function getPacksContainingItem($item, $item_attribute_id, $id_lang = fal
5858
}
5959
return Pack::getPacksContainingItem($item->id, $item_attribute_id, $id_lang);
6060
}
61-
61+
6262
/**
6363
* Is this product a pack?
6464
*
@@ -69,7 +69,7 @@ public function isPack($product)
6969
{
7070
return Pack::isPack($product->id);
7171
}
72-
72+
7373
/**
7474
* Is this product in a pack?
7575
* If $id_product_attribute specified, then will restrict search on the given combination,
@@ -83,5 +83,5 @@ public function isPacked($product, $id_product_attribute = false)
8383
{
8484
return Pack::isPacked($product->id, $id_product_attribute);
8585
}
86-
86+
8787
}

‎Adapter/Adapter_ProductPriceCalculator.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* 2007-2015 PrestaShop
3+
* 2007-2017 PrestaShop
44
*
55
* NOTICE OF LICENSE
66
*
@@ -19,7 +19,7 @@
1919
* needs please refer to http://www.prestashop.com for more information.
2020
*
2121
* @author PrestaShop SA <contact@prestashop.com>
22-
* @copyright 2007-2015 PrestaShop SA
22+
* @copyright 2007-2017 PrestaShop SA
2323
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2424
* International Registered Trademark & Property of PrestaShop SA
2525
*/

0 commit comments

Comments
 (0)