dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

//fix sarah bug :p

Browse Source
This commit is contained in:
vAugagneur
2012-11-22 17:52:10 +01:00
parent 867c9a5135
commit c11b283fca
1 changed files with 817 additions and 822 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/PaymentModule.php
-5
View File
@@ -1,4 +1,3 @@
<<<<<<< HEAD
<?php <?php
/* /*
* 2007-2012 PrestaShop * 2007-2012 PrestaShop
@@ -1624,7 +1623,6 @@ abstract class PaymentModuleCore extends Module
'); ');
} }
public static function preCall($module_name) public static function preCall($module_name)
{ {
if (!parent::preCall($module_name)) if (!parent::preCall($module_name))
@@ -1636,7 +1634,4 @@ abstract class PaymentModuleCore extends Module
return false; return false;
} }
} }
>>>>>>> [-] FO: fixed bug #PSCFV-5779 - order_conf still not fixed propertly